Skip to contentSkip to conversation

device_cgroup: fix RCU imbalance in error case

PATCH Applied Jann Horn 3 participants 3 messages Mar 19, 2019

Subsystems (2)
lore
Share & tools
lore

Jann Horn

author
#0 lore raw

PATCH 1/1 device_cgroup: fix RCU imbalance in error case

When dev_exception_add() returns an error (due to a failed memory allocation), make sure that we move the RCU preemption count back to where it was before we were called. We dropped the RCU read lock inside the loop body, so we can't just "break".

sparse complains about this, too:

$ make -s C=2 security/device_cgroup.o
./include/linux/rcupdate.h:647:9: warning: context imbalance in
'propagate_exception' - unexpected unlock
Fixes d591fb56618f ("device_cgroup: simplify cgroup tree walk in propagate_exception()")

---
Compile-tested only.

I'm not entirely sure who's supposed to be the maintainer for this thing. The sign-offs on the commits to this file come from Tejun, but MAINTAINERS claims it's part of security/, so I'm just sending this to both the security folks and the cgroup folks, you can figure out whose tree you want to take this through. :P
If the cgroup folks feel responsible for this file, maybe you could fix up MAINTAINERS?

 security/device_cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
security/device_cgroup.c +1 -1
index cd97929fac66..dc28914fa72e 100644
@@ -560,7 +560,7 @@ static int propagate_exception(struct dev_cgroup *devcg_root,
 		    devcg->behavior == DEVCG_DEFAULT_ALLOW) {
 			rc = dev_exception_add(devcg, ex);
 			if (rc)
-				break;
+				return rc;
 		} else {
 			/*
 			 * in the other possible cases:
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jann Horn

When dev_exception_add() returns an error (due to a failed memory allocation), make sure that we move the RCU preemption count back to where it was before we were called. We dropped the RCU read lock inside the loop body, so we can't just "break".

sparse complains about this, too:

Quoted 7 lines
$ make -s C=2 security/device_cgroup.o
./include/linux/rcupdate.h:647:9: warning: context imbalance in
'propagate_exception' - unexpected unlock
Fixes d591fb56618f ("device_cgroup: simplify cgroup tree walk in propagate_exception()")

FWIW looks good to me.

Thanks

Quoted 29 lines

---
Compile-tested only.

I'm not entirely sure who's supposed to be the maintainer for this thing. The sign-offs on the commits to this file come from Tejun, but MAINTAINERS claims it's part of security/, so I'm just sending this to both the security folks and the cgroup folks, you can figure out whose tree you want to take this through. :P
If the cgroup folks feel responsible for this file, maybe you could fix up MAINTAINERS?

 security/device_cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
security/device_cgroup.c +1 -1
index cd97929fac66..dc28914fa72e 100644
@@ -560,7 +560,7 @@ static int propagate_exception(struct dev_cgroup *devcg_root,
 		    devcg->behavior == DEVCG_DEFAULT_ALLOW) {
 			rc = dev_exception_add(devcg, ex);
 			if (rc)
-				break;
+				return rc;
 		} else {
 			/*
 			 * in the other possible cases:
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Signature · 2 lines
Michal Hocko
SUSE Labs
maintainer Applied
#2 lore raw
In reply to Jann Horn
Quoted 7 lines · Jann Horn

When dev_exception_add() returns an error (due to a failed memory allocation), make sure that we move the RCU preemption count back to where it was before we were called. We dropped the RCU read lock inside the loop body, so we can't just "break".

sparse complains about this, too:

Quoted 7 lines
$ make -s C=2 security/device_cgroup.o
./include/linux/rcupdate.h:647:9: warning: context imbalance in
'propagate_exception' - unexpected unlock
Fixes d591fb56618f ("device_cgroup: simplify cgroup tree walk in propagate_exception()")

Applied to cgroup/for-5.1-fixes.

Thanks.

Signature · 1 line
tejun