Skip to content

Commit

Permalink
device_cgroup: fix RCU imbalance in error case
Browse files Browse the repository at this point in the history
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: d591fb5 ("device_cgroup: simplify cgroup tree walk in propagate_exception()")
Cc: [email protected]
Signed-off-by: Jann Horn <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
  • Loading branch information
thejh authored and htejun committed Mar 19, 2019
1 parent 9e98c67 commit 0fcc4c8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/device_cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 0fcc4c8

Please sign in to comment.