projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf/x86-ibs' into perf/core
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
capability.c
diff --git
a/kernel/capability.c
b/kernel/capability.c
index 0fcf1c14a297c57d7cda541b71438441dd1adbde..3f1adb6c647015d80aa6b5b138f118fde7484d11 100644
(file)
--- a/
kernel/capability.c
+++ b/
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;
}