lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 793/917] block: fix device_add_disk() kobject_create_and_add() error handling
    Date
    From: Luis Chamberlain <mcgrof@kernel.org>

    [ Upstream commit fe7d064fa3faec5d8157029fb8720b4fddc9e1e8 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/genhd.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/block/genhd.c b/block/genhd.c
    index ab12ae6e636e8..6accd0b185e9e 100644
    --- a/block/genhd.c
    +++ b/block/genhd.c
    @@ -467,11 +467,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)
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:38    [W:4.047 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site