summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-15 23:28:02 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-15 23:28:02 +0400
commitb5745c59627854afb3cd3f3860ee6f4571e2b633 (patch)
treedf9f3bb37b4cf0f3c52c970927bed4a843234e29 /kernel
parent29b1deb2a48a9dd02b93597aa4c055a24c0e989f (diff)
parentd93aca6050b10cd7d8b491637c3b5344c5680cac (diff)
downloadlinux-b5745c59627854afb3cd3f3860ee6f4571e2b633.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull SELinux fixes from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_postroute() selinux: look for IPsec labels on both inbound and outbound packets selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute() selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output() selinux: fix possible memory leak
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions