2014-02-10 00:43:20

by James Morris

[permalink] [raw]
Subject: [GIT] SELinux fixes

Please pull for 3.14

The following changes since commit 9c1db7798141e2658e4b5bb170128dfdc3270ff4:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (2014-02-09 11:12:26 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

James Morris (1):
Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus

Paul Moore (2):
Merge tag 'v3.13' into stable-3.14
selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types

Stephen Smalley (1):
SELinux: Fix kernel BUG on empty security contexts.

security/selinux/nlmsgtab.c | 2 ++
security/selinux/ss/services.c | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)