From: Cengiz Can <cengiz@kernel.wtf>
To: Jens Axboe <axboe@kernel.dk>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Cengiz Can <cengiz@kernel.wtf>
Subject: [PATCH] blktrace: fix dereference after null check
Date: Tue, 3 Mar 2020 10:33:59 +0300 [thread overview]
Message-ID: <20200303073358.57799-1-cengiz@kernel.wtf> (raw)
There was a recent change in blktrace.c that added a RCU protection to
`q->blk_trace` in order to fix a use-after-free issue during access.
However the change missed an edge case that can lead to dereferencing of
`bt` pointer even when it's NULL:
```
bt->act_mask = value; // bt can still be NULL here
```
Added a reassignment into the NULL check block to fix the issue.
Fixes: c780e86dd48 ("blktrace: Protect q->blk_trace with RCU")
Signed-off-by: Cengiz Can <cengiz@kernel.wtf>
---
Huge thanks goes to Steven Rostedt for his assistance.
kernel/trace/blktrace.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 4560878f0bac..29ea88f10b87 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1896,8 +1896,10 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
}
ret = 0;
- if (bt == NULL)
+ if (bt == NULL) {
ret = blk_trace_setup_queue(q, bdev);
+ bt = q->blk_trace;
+ }
if (ret == 0) {
if (attr == &dev_attr_act_mask)
--
2.25.1
next reply other threads:[~2020-03-03 7:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 7:33 Cengiz Can [this message]
2020-03-03 13:29 ` [PATCH] blktrace: fix dereference after null check Bob Liu
2020-03-03 13:35 ` Steven Rostedt
2020-03-03 13:44 ` Bob Liu
2020-03-03 14:14 ` Steven Rostedt
2020-03-04 11:07 ` Cengiz Can
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=20200303073358.57799-1-cengiz@kernel.wtf \
--to=cengiz@kernel.wtf \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.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).