| commit | 9d22167f34305280c5dd57a74c21651da3c23015 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 09 12:24:21 2019 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 09 12:24:21 2019 -0700 |
| tree | 2cafd45c1ea48fc922c178260b508d68a6e909d8 | |
| parent | 593c75463ab6d6985cdc9916f3d1c28b5f6340cd [diff] | |
| parent | c5eaab1d131d0a6272df7d55a971a67400d63f56 [diff] |
Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull capabilities update from James Morris:
"Minor fixes for capabilities:
- Update the commoncap.c code to utilize XATTR_SECURITY_PREFIX_LEN,
from Carmeli tamir.
- Make the capability hooks static, from Yue Haibing"
* 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security/commoncap: Use xattr security prefix len
security: Make capability_hooks static