From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Bart Van Assche <bvanassche@acm.org>,
Christoph Hellwig <hch@infradead.org>,
Ming Lei <ming.lei@redhat.com>, Hannes Reinecke <hare@suse.com>,
Johannes Thumshirn <jth@kernel.org>
Subject: [PATCH v3 7/8] null_blk: Handle null_add_dev() failures properly
Date: Thu, 20 Feb 2020 19:22:42 -0800 [thread overview]
Message-ID: <20200221032243.9708-8-bvanassche@acm.org> (raw)
In-Reply-To: <20200221032243.9708-1-bvanassche@acm.org>
If null_add_dev() fails then null_del_dev() is called with a NULL argument.
Make null_del_dev() handle this scenario correctly. This patch fixes the
following KASAN complaint:
null-ptr-deref in null_del_dev+0x28/0x280 [null_blk]
Read of size 8 at addr 0000000000000000 by task find/1062
Call Trace:
dump_stack+0xa5/0xe6
__kasan_report.cold+0x65/0x99
kasan_report+0x16/0x20
__asan_load8+0x58/0x90
null_del_dev+0x28/0x280 [null_blk]
nullb_group_drop_item+0x7e/0xa0 [null_blk]
client_drop_item+0x53/0x80 [configfs]
configfs_rmdir+0x395/0x4e0 [configfs]
vfs_rmdir+0xb6/0x220
do_rmdir+0x238/0x2c0
__x64_sys_unlinkat+0x75/0x90
do_syscall_64+0x6f/0x2f0
entry_SYSCALL_64_after_hwframe+0x49/0xbe
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/block/null_blk_main.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 9846648780b6..ba83fd0537ce 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1469,7 +1469,12 @@ static const struct blk_mq_ops null_mq_ops = {
static void null_del_dev(struct nullb *nullb)
{
- struct nullb_device *dev = nullb->dev;
+ struct nullb_device *dev;
+
+ if (!nullb)
+ return;
+
+ dev = nullb->dev;
ida_simple_remove(&nullb_indexes, nullb->index);
next prev parent reply other threads:[~2020-02-21 3:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 3:22 [PATCH v3 0/8] Improve changing the number of hardware queues Bart Van Assche
2020-02-21 3:22 ` [PATCH v3 1/8] blk-mq: Fix a comment in include/linux/blk-mq.h Bart Van Assche
2020-02-24 10:58 ` Chaitanya Kulkarni
2020-02-21 3:22 ` [PATCH v3 2/8] blk-mq: Keep set->nr_hw_queues and set->map[].nr_queues in sync Bart Van Assche
2020-02-24 11:00 ` Chaitanya Kulkarni
2020-02-25 0:47 ` Ming Lei
2020-03-06 2:46 ` Ming Lei
2020-03-06 10:04 ` Ming Lei
2020-02-21 3:22 ` [PATCH v3 3/8] blk-mq: Fix a recently introduced regression in blk_mq_realloc_hw_ctxs() Bart Van Assche
2020-02-21 3:22 ` [PATCH v3 4/8] null_blk: Suppress an UBSAN complaint triggered when setting 'memory_backed' Bart Van Assche
2020-02-24 11:28 ` Chaitanya Kulkarni
2020-02-24 15:20 ` Bart Van Assche
2020-02-21 3:22 ` [PATCH v3 5/8] null_blk: Fix changing the number of hardware queues Bart Van Assche
2020-02-21 3:22 ` [PATCH v3 6/8] null_blk: Fix the null_add_dev() error path Bart Van Assche
2020-02-24 11:30 ` Chaitanya Kulkarni
2020-02-21 3:22 ` Bart Van Assche [this message]
2020-02-24 11:31 ` [PATCH v3 7/8] null_blk: Handle null_add_dev() failures properly Chaitanya Kulkarni
2020-02-21 3:22 ` [PATCH v3 8/8] null_blk: Add support for init_hctx() fault injection Bart Van Assche
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=20200221032243.9708-8-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jth@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
/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).