[v1] tty: Fix a possible resource leak in icom_probe

[PATCH] tty: Fix a possible resource leak in icom_probe

Posted by Huang Guobin 4 years, 2 months ago

When pci_read_config_dword failed, call pci_release_regions() and
pci_disable_device() to recycle the resource previously allocated.

Signed-off-by: Huang Guobin <huangguobin4@huawei.com>
---
 drivers/tty/serial/icom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 03a2fe9f4c9a..02b375ba2f07 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1501,7 +1501,7 @@ static int icom_probe(struct pci_dev *dev,
 	retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg);
 	if (retval) {
 		dev_err(&dev->dev, "PCI Config read FAILED\n");
-		return retval;
+		goto probe_exit0;
 	}
 
 	pci_write_config_dword(dev, PCI_COMMAND,
-- 
2.25.1

Re: [PATCH] tty: Fix a possible resource leak in icom_probe

Posted by Jiri Slaby 4 years, 2 months ago

On 31. 03. 22, 11:10, Huang Guobin wrote:
> When pci_read_config_dword failed, call pci_release_regions() and
> pci_disable_device() to recycle the resource previously allocated.

Reviewed-by: Jiri Slaby <jirislaby@kernel.org>


> Signed-off-by: Huang Guobin <huangguobin4@huawei.com>
> ---
>   drivers/tty/serial/icom.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
> index 03a2fe9f4c9a..02b375ba2f07 100644
> --- a/drivers/tty/serial/icom.c
> +++ b/drivers/tty/serial/icom.c
> @@ -1501,7 +1501,7 @@ static int icom_probe(struct pci_dev *dev,
>   	retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg);
>   	if (retval) {
>   		dev_err(&dev->dev, "PCI Config read FAILED\n");
> -		return retval;
> +		goto probe_exit0;
>   	}
>   
>   	pci_write_config_dword(dev, PCI_COMMAND,


-- 
js
suse labs