[PATCH -next 1/2] PCI: fix possible memory leak in error case in pci_setup_device()

[PATCH -next 1/2] PCI: fix possible memory leak in error case in pci_setup_device()

[Yang Yingliang]

If pci_setup_device() fails, the device name need be freed
to avoid memory leak.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/pci/probe.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c5286b027f00..0e947f24153e 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1976,6 +1976,7 @@ int pci_setup_device(struct pci_dev *dev)
 	default:				    /* unknown header */
 		pci_err(dev, "unknown header type %02x, ignoring device\n",
 			dev->hdr_type);
+		kfree_const(dev->dev.kobj.name);
 		pci_release_of_node(dev);
 		return -EIO;
 
-- 
2.25.1

[PATCH -next 2/2] PCI: switch to use dev_err_probe()

[Yang Yingliang]

Use dev_err_probe() to simplify code and print error code.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/pci/probe.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 0e947f24153e..f2430da8a30b 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -3054,10 +3054,9 @@ int pci_host_probe(struct pci_host_bridge *bridge)
 	int ret;
 
 	ret = pci_scan_root_bus_bridge(bridge);
-	if (ret < 0) {
-		dev_err(bridge->dev.parent, "Scanning root bridge failed");
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(bridge->dev.parent, ret,
+				     "Scanning root bridge failed");
 
 	bus = bridge->bus;
 
-- 
2.25.1

Re: [PATCH -next 2/2] PCI: switch to use dev_err_probe()

[Christophe JAILLET]

Le 17/08/2022 à 10:44, Yang Yingliang a écrit :
> Use dev_err_probe() to simplify code and print error code.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>   drivers/pci/probe.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 0e947f24153e..f2430da8a30b 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -3054,10 +3054,9 @@ int pci_host_probe(struct pci_host_bridge *bridge)
>   	int ret;
>   
>   	ret = pci_scan_root_bus_bridge(bridge);
> -	if (ret < 0) {
> -		dev_err(bridge->dev.parent, "Scanning root bridge failed");
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(bridge->dev.parent, ret,
> +				     "Scanning root bridge failed");
>   
>   	bus = bridge->bus;
>   

Nit: you could also add a \n at the end of the message.

Just my 2c,

CJ