diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-22 00:27:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-22 00:27:41 +0100 |
commit | 3b404a519815b9820f73f1ecf404e5546c9270ba (patch) | |
tree | aaa2975ab06a0f6f24bf21906577f5f065c48d98 /net/ipv4/tcp.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
parent | apparmor: fix change_hat not finding hat after policy replacement (diff) | |
download | linux-3b404a519815b9820f73f1ecf404e5546c9270ba.tar.xz linux-3b404a519815b9820f73f1ecf404e5546c9270ba.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull apparmor bugfix from James Morris:
"This has a fix for a policy replacement bug that is fairly serious for
apache mod_apparmor users, as it results in the wrong policy being
applied on an network facing service"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
apparmor: fix change_hat not finding hat after policy replacement
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions