diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-16 15:06:23 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-16 15:06:23 +0200 |
| commit | 0c9a66ec0e362fe9aff545b755430e56f58f2b96 (patch) | |
| tree | 3ffc63e84133d640b9d7def9102ab62a30da460e /security/commoncap.c | |
| parent | c2c4be28c248232d5bdfa5911f3b721db771f4f0 (diff) | |
| parent | 9ca250a5137f3df7ffac58b49660beadd5926ace (diff) | |
| download | talos-op-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.tar.gz talos-op-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 6bf72b175b49..c25e0d27537f 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -294,10 +294,10 @@ int cap_capset(struct cred *new, * * Determine if an inode having a change applied that's marked ATTR_KILL_PRIV * affects the security markings on that inode, and if it is, should - * inode_killpriv() be invoked or the change rejected? + * inode_killpriv() be invoked or the change rejected. * - * Returns 0 if granted; +ve if granted, but inode_killpriv() is required; and - * -ve to deny the change. + * Returns 1 if security.capability has a value, meaning inode_killpriv() + * is required, 0 otherwise, meaning inode_killpriv() is not required. */ int cap_inode_need_killpriv(struct dentry *dentry) { |
