netdev - Re: [PATCH] rtl818x_pci: Disable pci device in error handling code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sat, 30 Jan 2016 17:19:12 +0100
From:	Andrea Merello <andrea.merello@...il.com>
To:	Jia-Ju Bai <baijiaju1990@....com>
Cc:	Larry Finger <Larry.Finger@...inger.net>,
	Michael Wu <flamingice@...rmilk.net>, kvalo@...eaurora.org,
	Linux Wireless List <linux-wireless@...r.kernel.org>,
	netdev@...r.kernel.org
Subject: Re: [PATCH] rtl818x_pci: Disable pci device in error handling code

Acked-by: Andrea Merello <andrea.merello@...il.com>

On Sat, Jan 16, 2016 at 2:02 PM, Jia-Ju Bai <baijiaju1990@....com> wrote:
> When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
> called to disable the device which is enabled by pci_enbale_device.
>
> This patch fixes the problem by adding a new lable in error handling code.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@....com>
> ---
>  drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> index a43a16f..c76af5d 100644
> --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> @@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
>         if (err) {
>                 printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
>                        pci_name(pdev));
> -               return err;
> +               goto err_disable_dev;
>         }
>
>         io_addr = pci_resource_start(pdev, 0);
> @@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
>
>   err_free_reg:
>         pci_release_regions(pdev);
> +
> + err_disable_dev:
>         pci_disable_device(pdev);
>         return err;
>  }
> --
> 1.7.9.5
>
>