Skip to contentSkip to conversation

blktrace: fix dereference after null check

PATCH Applied Cengiz Can 5 participants 5 messages Mar 4, 2020 – Mar 5, 2020

Subsystems (2)
lore
Share & tools
lore

Cengiz Can

author
#0 lore raw

PATCH v2 1/1 blktrace: fix dereference after null check

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")

---

Patch Changelog
* v2: Added RCU annotation to assignment

 kernel/trace/blktrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +4 -1
index 4560878f0bac..ca39dc3230cb 100644
@@ -1896,8 +1896,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.25.1

Reviewed-by on v2 1/1
#1 lore raw
Quoted 59 lines · Cengiz Can

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")

---

Patch Changelog
* v2: Added RCU annotation to assignment

 kernel/trace/blktrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +4 -2
index 4560878f0bac..ca39dc3230cb 100644
@@ -1896,8 +1896,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)
--
Quoted 2 lines

2.25.1

Signature · 1 line
Ming Lei
Reviewed-by on v2 1/1
#2 lore raw
In reply to Cengiz Can
Quoted 27 lines · Cengiz Can

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)
```
Quoted 5 lines

Added a reassignment with RCU annotation to fix the issue.

Fixes c780e86dd48 ("blktrace: Protect q->blk_trace with RCU")

This version looks good to me, thanks.

Quoted 28 lines

---

Patch Changelog
* v2: Added RCU annotation to assignment

 kernel/trace/blktrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +4 -2
index 4560878f0bac..ca39dc3230cb 100644
@@ -1896,8 +1896,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.25.1

maintainer Reviewed-by on v2 1/1
#3 lore raw
In reply to Cengiz Can
Quoted 27 lines · On Wed, 4 Mar 2020 13:58:19 +0300 Cengiz Can <[email protected]> wrote:

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)
```
Quoted 5 lines

Added a reassignment with RCU annotation to fix the issue.

Fixes c780e86dd48 ("blktrace: Protect q->blk_trace with RCU")

-- Steve

Quoted 27 lines

---

Patch Changelog
* v2: Added RCU annotation to assignment

 kernel/trace/blktrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +4 -2
index 4560878f0bac..ca39dc3230cb 100644
@@ -1896,8 +1896,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.25.1

maintainer Applied
#4 lore raw
In reply to Cengiz Can
Quoted 27 lines · Cengiz Can

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)
```
Quoted 1 line

Added a reassignment with RCU annotation to fix the issue.

Applied, thanks.

Signature · 1 line
Jens Axboe