diff options
author | James Morris <jmorris@namei.org> | 2009-01-06 17:21:54 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-01-06 17:21:54 -0500 |
commit | 29881c4502ba05f46bc12ae8053d4e08d7e2615c (patch) | |
tree | 536ea4ac63554e836438bd5f370ddecaa343f1f4 /kernel/capability.c | |
parent | 76f7ba35d4b5219fcc4cb072134c020ec77d030d (diff) |
Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"
This reverts commit 14eaddc967b16017d4a1a24d2be6c28ecbe06ed8.
David has a better version to come.
Diffstat (limited to 'kernel/capability.c')
-rw-r--r-- | kernel/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index df62f53f84ac..36b4b4daebec 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
@@ -308,7 +308,7 @@ int capable(int cap) | |||
308 | BUG(); | 308 | BUG(); |
309 | } | 309 | } |
310 | 310 | ||
311 | if (security_capable(cap) == 0) { | 311 | if (has_capability(current, cap)) { |
312 | current->flags |= PF_SUPERPRIV; | 312 | current->flags |= PF_SUPERPRIV; |
313 | return 1; | 313 | return 1; |
314 | } | 314 | } |