diff options
| author | Eric Paris <eparis@redhat.com> | 2012-01-03 18:25:15 +0100 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2012-01-06 00:52:58 +0100 |
| commit | d2a7009f0bb03fa22ad08dd25472efa0568126b9 (patch) | |
| tree | a24f4739d1063b96789770fbc463069d96bde2f8 /kernel | |
| parent | capabilities: style only - move capable below ns_capable (diff) | |
| download | linux-d2a7009f0bb03fa22ad08dd25472efa0568126b9.tar.xz linux-d2a7009f0bb03fa22ad08dd25472efa0568126b9.zip | |
capabitlies: ns_capable can use the cap helpers rather than lsm call
Just to reduce the number of places to change if we every change the LSM
hook, use the capability helpers internally when possible.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Diffstat (limited to 'kernel')
| -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 5f99e5d68e1f..47626446c39a 100644 --- a/kernel/capability.c +++ b/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; } |