projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-block.git]
/
kernel
/
capability.c
diff --git
a/kernel/capability.c
b/kernel/capability.c
index c598d9d5be4fd6d325286ddab316ff8ae0e22651..688926e496be18737d8ae37af9fe807f75185f56 100644
(file)
--- 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;
}