diff --git a/[refs] b/[refs] index 945aacbfa29e..a7535abdeaae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 105ddf49cd301b7929a92f269440e8e562ef19db +refs/heads/master: d2a7009f0bb03fa22ad08dd25472efa0568126b9 diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c index 5f99e5d68e1f..47626446c39a 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 (security_capable(current_cred(), ns, cap) == 0) { + if (has_ns_capability(current, ns, cap)) { current->flags |= PF_SUPERPRIV; return true; }