From: Bart Van Assche <bart.vanassche@sandisk.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>,
Bart Van Assche <bart.vanassche@sandisk.com>,
Omar Sandoval <osandov@fb.com>, Hannes Reinecke <hare@suse.com>
Subject: [PATCH 1/6] blk-mq: Do not invoke queue operations on a dead queue
Date: Tue, 11 Apr 2017 13:58:37 -0700 [thread overview]
Message-ID: <20170411205842.28137-2-bart.vanassche@sandisk.com> (raw)
In-Reply-To: <20170411205842.28137-1-bart.vanassche@sandisk.com>
The blk-mq debugfs attributes are removed after blk_cleanup_queue()
has finished. Since running a queue after a queue has entered the
"dead" state is not allowed, disallow this. This patch avoids that
an attempt to run a dead queue triggers a kernel crash.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Hannes Reinecke <hare@suse.com>
---
block/blk-mq-debugfs.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index df9b688b877c..a1ce823578c7 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -111,6 +111,14 @@ static ssize_t blk_queue_flags_store(struct file *file, const char __user *ubuf,
struct request_queue *q = file_inode(file)->i_private;
char op[16] = { }, *s;
+ /*
+ * The debugfs attributes are removed after blk_cleanup_queue() has
+ * called blk_mq_free_queue(). Return if QUEUE_FLAG_DEAD has been set
+ * to avoid triggering a use-after-free.
+ */
+ if (blk_queue_dead(q))
+ return -ENOENT;
+
len = min(len, sizeof(op) - 1);
if (copy_from_user(op, ubuf, len))
return -EFAULT;
--
2.12.0
next prev parent reply other threads:[~2017-04-11 20:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 20:58 [PATCH 0/6] blk-mq debugfs patches for kernel v4.12 Bart Van Assche
2017-04-11 20:58 ` Bart Van Assche [this message]
2017-04-13 23:01 ` [PATCH 1/6] blk-mq: Do not invoke queue operations on a dead queue Omar Sandoval
2017-04-13 23:03 ` Omar Sandoval
2017-04-13 23:05 ` Bart Van Assche
2017-04-14 7:40 ` Omar Sandoval
2017-04-14 16:12 ` Bart Van Assche
2017-04-14 17:13 ` Omar Sandoval
2017-04-14 17:37 ` Bart Van Assche
2017-04-11 20:58 ` [PATCH 2/6] blk-mq: Move the "state" debugfs attribute one level down Bart Van Assche
2017-04-13 23:01 ` Omar Sandoval
2017-04-11 20:58 ` [PATCH 3/6] blk-mq: Make blk_flags_show() callers append a newline character Bart Van Assche
2017-04-13 23:08 ` Omar Sandoval
2017-04-11 20:58 ` [PATCH 4/6] blk-mq: Show operation, cmd_flags and rq_flags names Bart Van Assche
2017-04-13 23:17 ` Omar Sandoval
2017-04-11 20:58 ` [PATCH 5/6] blk-mq: Add blk_mq_ops.show_rq() Bart Van Assche
2017-04-13 23:21 ` Omar Sandoval
2017-04-14 16:03 ` Bart Van Assche
2017-04-11 20:58 ` [PATCH 6/6] scsi: Implement blk_mq_ops.show_rq() 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=20170411205842.28137-2-bart.vanassche@sandisk.com \
--to=bart.vanassche@sandisk.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.com \
--cc=linux-block@vger.kernel.org \
--cc=osandov@fb.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