aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2011-02-09 22:11:51 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-24 14:54:29 -0800
commit50194161bee65819784a08b5b7d4f2a2320ed8c2 (patch)
tree273848f603fec10c177fd5623b5479a71f5c80cd /kernel
parentdcf2ef88e48b7257b23aa13b9358779c72609a2c (diff)
security: add cred argument to security_capable()
commit 6037b715d6fab139742c3df8851db4c823081561 upstream. Expand security_capable() to include cred, so that it can be usable in a wider range of call sites. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: James Morris <jmorris@namei.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/capability.c b/kernel/capability.c
index 2f05303715a5..9e9385f132c8 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -306,7 +306,7 @@ int capable(int cap)
BUG();
}
- if (security_capable(cap) == 0) {
+ if (security_capable(current_cred(), cap) == 0) {
current->flags |= PF_SUPERPRIV;
return 1;
}