diff options
| author | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
| commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
| tree | 515f577bfddd054ee4373228be7c974dfb8133af /kernel | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| parent | 3699c53c485bf0168e6500d0ed18bf931584dd7c (diff) | |
Merge branch 'next' into for-linus
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 c598d9d5be4..688926e496b 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -306,7 +306,7 @@ int capable(int cap) BUG(); } - if (has_capability(current, cap)) { + if (security_capable(cap) == 0) { current->flags |= PF_SUPERPRIV; return 1; } |