linux-kernel - Re: [PATCH] nvme-pci: Fix an error handling path in 'nvme

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]

Message-ID: <20170717160918.GD24365@localhost.localdomain>
Date:   Mon, 17 Jul 2017 12:09:18 -0400
From:   Keith Busch <keith.busch@...el.com>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc:     axboe@...com, hch@....de, sagi@...mberg.me,
        linux-nvme@...ts.infradead.org, linux-kernel@...r.kernel.org,
        kernel-janitors@...r.kernel.org
Subject: Re: [PATCH] nvme-pci: Fix an error handling path in 'nvme_probe()'

On Sun, Jul 16, 2017 at 10:39:03AM +0200, Christophe JAILLET wrote:
> Release resources in the correct order in order not to miss a
> 'put_device()' if 'nvme_dev_map()' fails.
> 
> Fixes: b00a726a9fd8 ("NVMe: Don't unmap controller registers on reset")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>

Indeed, thanks for the fix. Alternatively this can be fixed by relocating
nvme_dev_map prior to the 'get_device' a few lines up. This patch is
okay, too.

Reviewed-by: Keith Busch <keith.busch@...el.com>

> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index d10d2f279d19..005beffd005d 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2282,7 +2282,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  
>  	result = nvme_dev_map(dev);
>  	if (result)
> -		goto free;
> +		goto put_pci;
>  
>  	INIT_WORK(&dev->ctrl.reset_work, nvme_reset_work);
>  	INIT_WORK(&dev->remove_work, nvme_remove_dead_ctrl_work);
> @@ -2291,7 +2291,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  
>  	result = nvme_setup_prp_pools(dev);
>  	if (result)
> -		goto put_pci;
> +		goto unmap;
>  
>  	quirks |= check_dell_samsung_bug(pdev);
>  
> @@ -2308,9 +2308,10 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  
>   release_pools:
>  	nvme_release_prp_pools(dev);
> + unmap:
> +	nvme_dev_unmap(dev);
>   put_pci:
>  	put_device(dev->dev);
> -	nvme_dev_unmap(dev);
>   free:
>  	kfree(dev->queues);
>  	kfree(dev);