Drop "blktrace: fix dereference after null check"
This commit is contained in:
parent
f6a9de8ee5
commit
d8230a09d2
|
@ -38,7 +38,6 @@ linux (4.19.119-1) UNRELEASED; urgency=medium
|
|||
- virtio-blk: improve virtqueue error to BLK_STS
|
||||
- scsi: smartpqi: fix call trace in device discovery
|
||||
- PCI/ASPM: Allow re-enabling Clock PM
|
||||
- blktrace: fix dereference after null check
|
||||
- KVM: VMX: Zero out *all* general purpose registers after VM-Exit
|
||||
- KVM: nVMX: Always sync GUEST_BNDCFGS when it comes from vmcs01
|
||||
- KVM: Introduce a new guest mapping API
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
From: Cengiz Can <cengiz@kernel.wtf>
|
||||
Date: Wed, 4 Mar 2020 13:58:19 +0300
|
||||
Subject: blktrace: fix dereference after null check
|
||||
Origin: https://git.kernel.org/linus/153031a301bb07194e9c37466cfce8eacb977621
|
||||
|
||||
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:
|
||||
|
||||
Coverity static analyzer marked this as a FORWARD_NULL issue with CID
|
||||
1460458.
|
||||
|
||||
```
|
||||
/kernel/trace/blktrace.c: 1904 in sysfs_blk_trace_attr_store()
|
||||
1898 ret = 0;
|
||||
1899 if (bt == NULL)
|
||||
1900 ret = blk_trace_setup_queue(q, bdev);
|
||||
1901
|
||||
1902 if (ret == 0) {
|
||||
1903 if (attr == &dev_attr_act_mask)
|
||||
>>> CID 1460458: Null pointer dereferences (FORWARD_NULL)
|
||||
>>> Dereferencing null pointer "bt".
|
||||
1904 bt->act_mask = value;
|
||||
1905 else if (attr == &dev_attr_pid)
|
||||
1906 bt->pid = value;
|
||||
1907 else if (attr == &dev_attr_start_lba)
|
||||
1908 bt->start_lba = value;
|
||||
1909 else if (attr == &dev_attr_end_lba)
|
||||
```
|
||||
|
||||
Added a reassignment with RCU annotation to fix the issue.
|
||||
|
||||
Fixes: c780e86dd48 ("blktrace: Protect q->blk_trace with RCU")
|
||||
Reviewed-by: Ming Lei <ming.lei@redhat.com>
|
||||
Reviewed-by: Bob Liu <bob.liu@oracle.com>
|
||||
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||||
Signed-off-by: Cengiz Can <cengiz@kernel.wtf>
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
|
||||
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||||
---
|
||||
kernel/trace/blktrace.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
|
||||
index 99f6cdbf2f540..6cea8bbca03cb 100644
|
||||
--- a/kernel/trace/blktrace.c
|
||||
+++ b/kernel/trace/blktrace.c
|
||||
@@ -1893,8 +1893,11 @@ 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 = rcu_dereference_protected(q->blk_trace,
|
||||
+ lockdep_is_held(&q->blk_trace_mutex));
|
||||
+ }
|
||||
|
||||
if (ret == 0) {
|
||||
if (attr == &dev_attr_act_mask)
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -298,7 +298,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch
|
|||
# Security fixes
|
||||
debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
|
||||
debian/ntfs-mark-it-as-broken.patch
|
||||
bugfix/all/blktrace-fix-dereference-after-null-check.patch
|
||||
bugfix/s390x/s390-mm-fix-page-table-upgrade-vs-2ndary-address-mod.patch
|
||||
bugfix/all/selinux-properly-handle-multiple-messages-in-selinux.patch
|
||||
bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch
|
||||
|
|
Loading…
Reference in New Issue