diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-29 23:24:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-29 23:24:05 +0300 |
| commit | 704bb813c2202f140d6c364a1703b0265473218f (patch) | |
| tree | a731f413d12acb19710ae1908092c980a55658f3 /drivers/parport | |
| parent | 26cd83670f2f5a3d5b5514a1f7d96567cdb9558b (diff) | |
| parent | 1c1ecf172a4616cd8567182b99efa7a5df77f5d2 (diff) | |
| download | linux-704bb813c2202f140d6c364a1703b0265473218f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fixes from James Morris:
"The keys patch fixes a bug which is breaking kerberos, and the seccomp
fix addresses a no_new_privs bypass"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set
seccomp: always propagate NO_NEW_PRIVS on tsync
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions