Merge branch 'next' into for-linus
This commit is contained in:
commit
ac8cc0fa53
26 changed files with 1231 additions and 425 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue