summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-19 18:03:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-19 18:03:55 -0700
commit371dd432ab39f7bc55d6ec77d63b430285627e04 (patch)
tree337e70e6203dcfaa4789966cd6af8cd5c7016564
parent4c3f49ae1306c05e91211c06feddfd0a4a57fabd (diff)
parent0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9 (diff)
downloadlinux-sh-371dd432ab39f7bc55d6ec77d63b430285627e04.tar.gz
Merge branch 'for-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "A patch to fix a RCU imbalance error in the devices cgroup configuration error path" * 'for-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: device_cgroup: fix RCU imbalance in error case
-rw-r--r--security/device_cgroup.c2
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: