tree df9f3bb37b4cf0f3c52c970927bed4a843234e29
parent 29b1deb2a48a9dd02b93597aa4c055a24c0e989f
parent d93aca6050b10cd7d8b491637c3b5344c5680cac
author Linus Torvalds <torvalds@linux-foundation.org> 1387135682 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1387135682 -0800

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