diff options
| author | Jann Horn <jannh@google.com> | 2019-03-19 02:36:59 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2019-03-19 10:46:15 -0700 |
| commit | 0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9 (patch) | |
| tree | 181570811ec1a929a32b9054f1f55ba7833dcecc /security/device_cgroup.c | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| download | linux-0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9.tar.gz linux-0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9.tar.bz2 linux-0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9.zip | |
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()")
Cc: stable@vger.kernel.org
Signed-off-by: Jann Horn <jannh@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'security/device_cgroup.c')
| -rw-r--r-- | security/device_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index cd97929fac66..dc28914fa72e 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -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: |