hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull misc security layer update from James Morris:
 "This is the remaining 'general' change in the security tree for v4.14,
  following the direct merging of SELinux (+ TOMOYO), AppArmor, and
  seccomp.

  That's everything now for the security tree except IMA, which will
  follow shortly (I've been traveling for the past week with patchy
  internet)"

* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: fix description of values returned by cap_inode_need_killpriv
This commit is contained in:
Linus Torvalds 2017-09-24 11:40:41 -07:00
parent 1436ab068d ab5348c9c2
commit a302824782
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/commoncap.c
View File

@ -294,10 +294,10 @@ int cap_capset(struct cred *new,
* *
* Determine if an inode having a change applied that's marked ATTR_KILL_PRIV * 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 * 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 * Returns 1 if security.capability has a value, meaning inode_killpriv()
* -ve to deny the change. * is required, 0 otherwise, meaning inode_killpriv() is not required.
*/ */
int cap_inode_need_killpriv(struct dentry *dentry) int cap_inode_need_killpriv(struct dentry *dentry)
{ {