Commit 371dd432 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4c3f49ae 0fcc4c8c
...@@ -560,7 +560,7 @@ static int propagate_exception(struct dev_cgroup *devcg_root, ...@@ -560,7 +560,7 @@ static int propagate_exception(struct dev_cgroup *devcg_root,
devcg->behavior == DEVCG_DEFAULT_ALLOW) { devcg->behavior == DEVCG_DEFAULT_ALLOW) {
rc = dev_exception_add(devcg, ex); rc = dev_exception_add(devcg, ex);
if (rc) if (rc)
break; return rc;
} else { } else {
/* /*
* in the other possible cases: * in the other possible cases:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment