block: fix device_add_disk() kobject_create_and_add() error handling
PATCH 1/1 block: fix device_add_disk() kobject_create_and_add() error handling
Commit 83cbce957446 ("block: add error handling for device_add_disk / add_disk") added error handling to device_add_disk(), however the goto label for the kobject_create_and_add() failure did not set the return value correctly, and so we can end up in a situation where kobject_create_and_add() fails but we report success.
--- block/genhd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/genhd.c +3 -1
@@ -478,8 +478,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,if (!disk->part0->bd_holder_dir) goto out_del_integrity; disk->slave_dir =kobject_create_and_add ("slaves" , &ddev->kobj); -if (!disk->slave_dir) +if (!disk->slave_dir) { + ret = -ENOMEM ; goto out_put_holder_dir; + } ret =bd_register_pending_holders (disk);if (ret <0 )
Signature · 1 line
2.33.0
Looks good,
Quoted 8 lines · Luis Chamberlain
Commit
83cbce957446("block: add error handling fordevice_add_disk/add_disk") added error handling todevice_add_disk(), however the goto label for thekobject_create_and_add()failure did not set the return value correctly, and so we can end up in a situation wherekobject_create_and_add()fails but we report success.[...]
Applied, thanks!
[1/1] block: fix device_add_disk() kobject_create_and_add() error handling
commit: 3554ce121f632db1f56f4e28dfe37da846617c9c
Best regards,
Signature · 1 line
Jens Axboe
Quoted 31 lines · Luis Chamberlain
Commit
83cbce957446("block: add error handling fordevice_add_disk/add_disk") added error handling todevice_add_disk(), however the goto label for thekobject_create_and_add()failure did not set the return value correctly, and so we can end up in a situation wherekobject_create_and_add()fails but we report success.Fixes 83cbce957446 ("block: add error handling for device_add_disk / add_disk")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Luis Chamberlain <[email protected]>--- block/genhd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)block/genhd.c +3
-1@@ -478,8 +478,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, if (!disk->part0->bd_holder_dir)in here also should be add ret = -ENOMEM; ? goto out_del_integrity; disk->slave_dir =kobject_create_and_add ("slaves" , &ddev->kobj); -if (!disk->slave_dir) +if (!disk->slave_dir) { + ret = -ENOMEM ; goto out_put_holder_dir; + } ret =bd_register_pending_holders (disk);if (ret <0 )
Quoted 19 lines · Luis Chamberlain
Commit
83cbce957446("block: add error handling fordevice_add_disk/add_disk") added error handling todevice_add_disk(), however the goto label for thekobject_create_and_add()failure did not set the return value correctly, and so we can end up in a situation wherekobject_create_and_add()fails but we report success.Fixes 83cbce957446 ("block: add error handling for device_add_disk / add_disk")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Luis Chamberlain <[email protected]>--- block/genhd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)block/genhd.c +0
-0
block/genhd.c int __must_check device_add_disk(struct device *parent, struct gendisk *disk, · line 478
Quoted 1 line
block/genhd.c +0
-0@@ -478,8 +478,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,if (!disk->part0->bd_holder_dir)
in here also should be add ret = -ENOMEM;
Quoted 11 lines
block/genhd.c +3
-1goto out_del_integrity; disk->slave_dir =kobject_create_and_add ("slaves" , &ddev->kobj); -if (!disk->slave_dir) +if (!disk->slave_dir) { + ret = -ENOMEM ; goto out_put_holder_dir; + } ret =bd_register_pending_holders (disk);if (ret <0 )