git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 15 Dec 2013 19:28:02 +0000 (11:28 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 15 Dec 2013 19:28:02 +0000 (11:28 -0800)

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

		1	2
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge