From: Wu Bo <wubo40@huawei.com>
To: Luis Chamberlain <mcgrof@kernel.org>, <axboe@kernel.dk>,
<hare@suse.de>, <hch@infradead.org>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"kernel test robot" <lkp@intel.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [PATCH] block: fix device_add_disk() kobject_create_and_add() error handling
Date: Thu, 4 Nov 2021 18:55:14 +0800 [thread overview]
Message-ID: <1bdaf8e4-319b-8dd2-9869-5bac8ffcbdf2@huawei.com> (raw)
In-Reply-To: <20211103164023.1384821-1-mcgrof@kernel.org>
On 2021/11/4 0:40, Luis Chamberlain wrote:
> 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>
> ---
> block/genhd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/block/genhd.c b/block/genhd.c
> index be4775c13760..b0b484116c3a 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -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)
>
next prev parent reply other threads:[~2021-11-04 10:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 16:40 [PATCH] block: fix device_add_disk() kobject_create_and_add() error handling Luis Chamberlain
2021-11-03 16:41 ` Christoph Hellwig
2021-11-03 19:28 ` Jens Axboe
2021-11-04 10:55 ` Wu Bo [this message]
2021-11-04 10:57 ` Wu Bo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1bdaf8e4-319b-8dd2-9869-5bac8ffcbdf2@huawei.com \
--to=wubo40@huawei.com \
--cc=axboe@kernel.dk \
--cc=dan.carpenter@oracle.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).