aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-17 08:44:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-17 08:44:27 -0700
commit1b3dfde386b7c72b8f5430dc40eee538eb40c948 (patch)
treee227d3de7e82b6b27e60cf7ece4881d269edeae7 /security
parent72714841b705a5b9bccf37ee85a62352bee3a3ef (diff)
parent31409c97640ff5f1a49e34ac7f3c82097bf57bec (diff)
downloadlinux-linaro-stable-1b3dfde386b7c72b8f5430dc40eee538eb40c948.tar.gz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU fix from Ingo Molnar: "Fix a false positive warning" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition
Diffstat (limited to 'security')
-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 73455089feef..03c1652c9a1f 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -401,7 +401,7 @@ static bool verify_new_ex(struct dev_cgroup *dev_cgroup,
bool match = false;
RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&
- lockdep_is_held(&devcgroup_mutex),
+ !lockdep_is_held(&devcgroup_mutex),
"device_cgroup:verify_new_ex called without proper synchronization");
if (dev_cgroup->behavior == DEVCG_DEFAULT_ALLOW) {