Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver...

[safe/jmp/linux-2.6] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index df62f53..36b4b4d 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -308,7 +308,7 @@ int capable(int cap)
                BUG();
        }
 
-       if (security_capable(cap) == 0) {
+       if (has_capability(current, cap)) {
                current->flags |= PF_SUPERPRIV;
                return 1;
        }