summaryrefslogtreecommitdiff
path: root/kernel/capability.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-06 22:58:22 (GMT)
committerJames Morris <jmorris@namei.org>2009-01-06 22:58:22 (GMT)
commitac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch)
tree515f577bfddd054ee4373228be7c974dfb8133af /kernel/capability.c
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
parent3699c53c485bf0168e6500d0ed18bf931584dd7c (diff)
downloadlinux-3.10-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.zip
linux-3.10-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.gz
linux-3.10-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.bz2
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/capability.c')
-rw-r--r--kernel/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/capability.c b/kernel/capability.c
index c598d9d..688926e 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -306,7 +306,7 @@ int capable(int cap)
BUG();
}
- if (has_capability(current, cap)) {
+ if (security_capable(cap) == 0) {
current->flags |= PF_SUPERPRIV;
return 1;
}