diff --git a/[refs] b/[refs] index 5d8a9dd97999..94c11ffbc5cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2bc3a316a7281f67e36b34dac2802cbe36a9128 +refs/heads/master: 951880e634a79884236a575b896abf55c39ae0bf diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c index 0fcf1c14a297..3f1adb6c6470 100644 --- a/trunk/kernel/capability.c +++ b/trunk/kernel/capability.c @@ -384,7 +384,7 @@ bool ns_capable(struct user_namespace *ns, int cap) BUG(); } - if (has_ns_capability(current, ns, cap)) { + if (security_capable(current_cred(), ns, cap) == 0) { current->flags |= PF_SUPERPRIV; return true; }