linux-kernel - Re: [PATCH] scsi: sd: unregister device if device_add_disk() failed in sd

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] [thread-next>] [day] [month] [year] [list]

Date: Mon, 1 Apr 2024 09:31:04 +0800
From: Yu Kuai <yukuai1@...weicloud.com>
To: linan666@...weicloud.com, jejb@...ux.ibm.com, martin.petersen@...cle.com,
 mcgrof@...nel.org, hch@....de, bvanassche@....org,
 "yukuai (C)" <yukuai3@...wei.com>
Cc: linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
 linan122@...wei.com, yi.zhang@...wei.com, houtao1@...wei.com,
 yangerkun@...wei.com
Subject: Re: [PATCH] scsi: sd: unregister device if device_add_disk() failed
 in sd_probe()

+CC Christoph Hellwig
+CC Bart Van Assche
在 2023/12/08 16:23, linan666@...weicloud.com 写道:
> From: Li Nan <linan122@...wei.com>
> 
> "if device_add() succeeds, you should call device_del() when you want to
> get rid of it."
> 
> In sd_probe(), device_add_disk() fails when device_add() has already
> succeeded, so change put_device() to device_unregister() to ensure device
> resources are released.

I was shocked that this patch is still there. This patch is easy and
straightforward.

LGTM
Reviewed-by: Yu Kuai <yukuai3@...wei.com>

BTW, Nan, it will be better if you have a reporducer for this.
> 
> Fixes: 2a7a891f4c40 ("scsi: sd: Add error handling support for add_disk()")
> Signed-off-by: Li Nan <linan122@...wei.com>
> ---
>   drivers/scsi/sd.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 542a4bbb21bc..d81cbeee06eb 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3736,7 +3736,7 @@ static int sd_probe(struct device *dev)
>   
>   	error = device_add_disk(dev, gd, NULL);
>   	if (error) {
> -		put_device(&sdkp->disk_dev);
> +		device_unregister(&sdkp->disk_dev);
>   		put_disk(gd);
>   		goto out;
>   	}
>