From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A4161A9B49 for ; Fri, 7 Mar 2025 08:46:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741337217; cv=none; b=SPgLQ7iwPfOOQrK3Fa7JecxjhyOiPdWKBeaZ8FP/DnhHgH9FSyIe0sLdhF/RX0kFl6qxBEULMsyYKH+xxnCKpGTTuFy10sQ6lhr0oQGSHpdebXpm96fkBZHk7NepEuaCJM23DmQWKMltAVEkm94LOw+9jzmjZe7NjvNE17KksPc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741337217; c=relaxed/simple; bh=2tCICcAJq3mMEdu4ZDVty00I9VzTBbw0rWKed6g0y1k=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DVzzQ9l359lS8tCt/32SUhMLrbzNNmrAagj9EuYavpoD7LcvPAZRvAri1CLXdf7V2yqX+Chhgke2Gz8ekLXJTiIJiKvZlV2eRiBM0I57AnIPC0kUE0MjHupx8xZZwp5uJSJDv84p0E9wkxRYxFIDg+h1m4d+zdfiZ31S7g0G15w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=eOm4uEvI; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eOm4uEvI" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43bdc607c16so12233815e9.1 for ; Fri, 07 Mar 2025 00:46:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741337214; x=1741942014; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=CURT3euQlvlJ1zWGuJW+d+Z8hIOMnrtr7tJOIL93/Ac=; b=eOm4uEvI8zz2mi7l1F08LqQwGSTneNiE/vhatQFpT8E9tJqTa3rnU+anEXpx6hH+u4 gJSsknIRQy9YW4/mlisDichoRvLYAOOYLqqlGTGyE5zeBN4UTE0m+y910WMjQPkOuGcx tSDruNw77Bjtq/1irOHSeWcD5rs7CWvUiAfhINkPfkM4uw/3cDZRj7xvRETgZ7rn2wo+ MJn3ul63qEepQLexx/Zmwy/5rwMlvpg8qamZVCPTow0U39FNr7L9fGwzQHzGvHlJtOTd jb13iLfAD9UExdezgrYHiMGNs3knu4hMlMDpmQ5S9wCur9j+dTNO4f8177Jm11s0E30e zqYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741337214; x=1741942014; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CURT3euQlvlJ1zWGuJW+d+Z8hIOMnrtr7tJOIL93/Ac=; b=VOzD+VpQwnJ2RKc1SWy/JgBplqQjafnh1HeYzbUcXQIPEJSkx45bijpaRWb73Z0bG9 nYVJBxcSqzQX3gwJFo1MZEXnISNUjE0NQT3bA/pred54e8eO6KkTtYvXvKkDIa+Bwv2L JRnkdCOiDbZzFdwV+Ym2t3Pv+X9dcQ1dGCUZeQJyg0qYW/2K4k868iXHx0HbSFr8nnBc WhOuRcNgoL9FuYNclTBGGiDAPTVCV8PkE874GGozfTU4dpWHnnRBGxNbLsMphE0RkbyM xV5upoH/WH+RbPbtVAPvvGhVpXiQH47g6ffGXJU/YMEAvqSi0qw9D3STGkNNnb3/EKSd gZvg== X-Forwarded-Encrypted: i=1; AJvYcCVYxP7lfK1qrqJN0dBs6JVAc63eFLbSo80gsiCKp3a6z8ANcC4CLhUbdSpTn++eycqLPqFenMva81NmQRE=@vger.kernel.org X-Gm-Message-State: AOJu0YyaJ7X63KIGDU/yBhyzhSlN/79CPOIxgSLuPTNk8Sii1W06JPYl iBND4In7brTU81jk2Zvo7AaCOwKRNmKkTYQgGB/O6NAtONR3eLfGyj24yFhchut0jVfDw8JXaMv B X-Gm-Gg: ASbGnctrvEptkZirSZUe4QgX0xZHrFURyHr71SQHk61suP4aUjkifcGGygjCs0+w60Q 2nARjxYlrn2w3hDpAYPvhZVSxV+4DbvOB4WCRcmO7MeNWiU3ufVJbWHp3U44ptQIIOo15CUUCG8 Jf0dHin9Fa3wF2aXBUQA6TAZGeRHhsYVTeMxUNibWQApl9HtiEjpxWAYXLvHN1oRfC9WQ3q61qW O9v26cPikDwgy8EcFz0/En+7DH7neFwRBWuoW7FdVLL6n7FtbLs1NhqH3Iq47mWOb1D0bNUof4w 7G3o7Ctwq+iKP+ygRoUpg/H+W/Zd6WelTpNuwfBPmk7NZkZaUQ== X-Google-Smtp-Source: AGHT+IEi5jnq9tYBMNZz/LbRpDjpN8pjvqYyLgYrE5AUx25gXQmhhihjTg9/axLoWRLHysByHJibOQ== X-Received: by 2002:a05:600c:4f91:b0:43b:d14d:8ff2 with SMTP id 5b1f17b1804b1-43c5a635695mr17068445e9.29.1741337213638; Fri, 07 Mar 2025 00:46:53 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3912c102db1sm4643611f8f.95.2025.03.07.00.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 00:46:53 -0800 (PST) Date: Fri, 7 Mar 2025 11:46:41 +0300 From: Dan Carpenter To: Ma Ke Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] PCI: Fix double free in pci_register_host_bridge() Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Calling put_device(&bus->dev) will call release_pcibus_dev() which will free the bus. It leads to a use after free when we dereference "bus" in the cleanup code and the kfree(bus) is a double free. Fixes: b80b4d4972e6 ("PCI: Fix reference leak in pci_register_host_bridge()") Signed-off-by: Dan Carpenter --- drivers/pci/probe.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 819d23ce3565..c13f2c957002 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -957,6 +957,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) resource_size_t offset, next_offset; LIST_HEAD(resources); struct resource *res, *next_res; + bool bus_registered = false; char addr[64], *fmt; const char *name; int err; @@ -1020,10 +1021,9 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) name = dev_name(&bus->dev); err = device_register(&bus->dev); - if (err) { - put_device(&bus->dev); + bus_registered = true; + if (err) goto unregister; - } pcibios_add_bus(bus); @@ -1110,12 +1110,15 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) unregister: put_device(&bridge->dev); device_del(&bridge->dev); - free: #ifdef CONFIG_PCI_DOMAINS_GENERIC pci_bus_release_domain_nr(parent, bus->domain_nr); #endif - kfree(bus); + if (bus_registered) + put_device(&bus->dev); + else + kfree(bus); + return err; } -- 2.47.2