diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 22:22:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 22:22:18 +0100 |
| commit | 0f221a3102bba2d982d01bad38eb68507c343830 (patch) | |
| tree | e46abcc1e415b912fadecc2cfc71db814e97894d /block | |
| parent | Merge tag 'watchdog-for-linus-v4.11-2' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | selinux: wrap cgroup seclabel support with its own policy capability (diff) | |
| download | linux-0f221a3102bba2d982d01bad38eb68507c343830.tar.xz linux-0f221a3102bba2d982d01bad38eb68507c343830.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem fixes from James Morris:
"Two fixes for the security subsystem:
- keys: split both rcu_dereference_key() and user_key_payload() into
versions which can be called with or without holding the key
semaphore.
- SELinux: fix Android init(8) breakage due to new cgroup security
labeling support when using older policy"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: wrap cgroup seclabel support with its own policy capability
KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions