diff mbox series

[V3,2/5] ublk_drv: fix ublk device leak in case that add_disk fails

Message ID 20220729072954.1070514-3-ming.lei@redhat.com (mailing list archive)
State New, archived
Headers show
Series ublk_drv: add generic mechanism to get/set parameters | expand

Commit Message

Ming Lei July 29, 2022, 7:29 a.m. UTC
->free_disk is only called after disk is added successfully, so
drop ublk device reference in case of add_disk() failure.

Fixes: 6d9e6dfdf3b2 ("ublk: defer disk allocation")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 drivers/block/ublk_drv.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Christoph Hellwig July 29, 2022, 2:20 p.m. UTC | #1
On Fri, Jul 29, 2022 at 03:29:51PM +0800, Ming Lei wrote:
>  	get_device(&ub->cdev_dev);
>  	ret = add_disk(disk);
>  	if (ret) {
> +		/*
> +		 * has to drop the reference since ->free_disk won't be
> +		 * called in case of add_disk failure
> +		 */

Nit: Multi-line comments typically start with a capitalized word and
end with a dot to form a proper sentence.

Otherwise looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>
diff mbox series

Patch

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 7ece4c2ef062..00b04f395de0 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1190,6 +1190,11 @@  static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd)
 	get_device(&ub->cdev_dev);
 	ret = add_disk(disk);
 	if (ret) {
+		/*
+		 * has to drop the reference since ->free_disk won't be
+		 * called in case of add_disk failure
+		 */
+		ublk_put_device(ub);
 		put_disk(disk);
 		goto out_unlock;
 	}