diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-06-03 19:10:29 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-06-03 19:10:29 +1000 |
| commit | e6e29a4eae335059d2cc44ac543de7556ff7ac09 (patch) | |
| tree | e09595fa1c5e5ac6c9eb1f92c86df1d0cfc62a9d /Documentation | |
| parent | ima: pass iint to ima_add_violation() (diff) | |
| parent | Smack: allow multiple labels in onlycap (diff) | |
| download | linux-dev-e6e29a4eae335059d2cc44ac543de7556ff7ac09.tar.xz linux-dev-e6e29a4eae335059d2cc44ac543de7556ff7ac09.zip | |
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/security/Smack.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt index abc82f85215b..de5e1aeca7fb 100644 --- a/Documentation/security/Smack.txt +++ b/Documentation/security/Smack.txt @@ -206,11 +206,11 @@ netlabel label. The format accepted on write is: "%d.%d.%d.%d label" or "%d.%d.%d.%d/%d label". onlycap - This contains the label processes must have for CAP_MAC_ADMIN + This contains labels processes must have for CAP_MAC_ADMIN and CAP_MAC_OVERRIDE to be effective. If this file is empty these capabilities are effective at for processes with any - label. The value is set by writing the desired label to the - file or cleared by writing "-" to the file. + label. The values are set by writing the desired labels, separated + by spaces, to the file or cleared by writing "-" to the file. ptrace This is used to define the current ptrace policy 0 - default: this is the policy that relies on Smack access rules. |