summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2021-11-03 17:40:23 +0100
committerJens Axboe <axboe@kernel.dk>2021-11-05 06:21:03 +0100
commitfe7d064fa3faec5d8157029fb8720b4fddc9e1e8 (patch)
tree710618c7ae9e4141b12e3e1a00251c493e5f748d /block
parentblock: ensure cached plug request matches the current queue (diff)
downloadlinux-fe7d064fa3faec5d8157029fb8720b4fddc9e1e8.tar.xz
linux-fe7d064fa3faec5d8157029fb8720b4fddc9e1e8.zip
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. Fixes: 83cbce957446 ("block: add error handling for device_add_disk / add_disk") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20211103164023.1384821-1-mcgrof@kernel.org [axboe: fold in followup fix from Wu Bo <wubo40@huawei.com>] Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 64f83c4aee99..8ea818aa88ca 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -468,11 +468,15 @@ int device_add_disk(struct device *parent, struct gendisk *disk,
disk->part0->bd_holder_dir =
kobject_create_and_add("holders", &ddev->kobj);
- if (!disk->part0->bd_holder_dir)
+ if (!disk->part0->bd_holder_dir) {
+ 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)