security: fix description of values returned by cap_inode_need_killpriv

stefanberger · James Morris · commit ab5348c9c23c · 2017-09-23T21:15:41.000-07:00
cap_inode_need_killpriv returns 1 if security.capability exists and
has a value and inode_killpriv() is required, 0 otherwise. Fix the
description of the return value to reflect this.

Signed-off-by: Stefan Berger &lt;stefanb@linux.vnet.ibm.com&gt;
Reviewed-by: Serge Hallyn &lt;serge@hallyn.com&gt;
Signed-off-by: James Morris &lt;james.l.morris@oracle.com&gt;
diff --git a/security/commoncap.c b/security/commoncap.c
@@ -300,10 +300,10 @@ static inline void bprm_clear_caps(struct linux_binprm *bprm)
  *
  * 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,10 @@ static inline void bprm_clear_caps(struct linux_binprm *bprm)`
`300`	`300`	`*`
`301`	`301`	`* Determine if an inode having a change applied that's marked ATTR_KILL_PRIV`
`302`	`302`	`* affects the security markings on that inode, and if it is, should`
`303`		`- * inode_killpriv() be invoked or the change rejected?`
	`303`	`+ * inode_killpriv() be invoked or the change rejected.`
`304`	`304`	`*`
`305`		`- * Returns 0 if granted; +ve if granted, but inode_killpriv() is required; and`
`306`		`- * -ve to deny the change.`
	`305`	`+ * Returns 1 if security.capability has a value, meaning inode_killpriv()`
	`306`	`+ * is required, 0 otherwise, meaning inode_killpriv() is not required.`
`307`	`307`	`*/`
`308`	`308`	`int cap_inode_need_killpriv(struct dentry *dentry)`
`309`	`309`	`{`