Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: security: enhance DEFAULT_MMAP_MIN_ADDR description SELinux: add netport.[ch] SELinux: Add network port SID cache SELinux: turn mount options strings into defines selinux/ss/services.c should #include <linux/selinux.h> selinux: introduce permissive types selinux: remove ptrace_sid SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG() security: code cleanup security: replace remaining __FUNCTION__ occurrences SELinux: create new open permission selinux: selinux/netlabel.c should #include "netlabel.h" SELinux: unify printk messages SELinux: remove unused backpointers from security objects SELinux: Correct the NetLabel locking for the sk_security_struct
2026-09-24 18:16:04 +00:00 · 2008-04-18 08:19:40 -07:00 · 2008-04-18 08:19:40 -07:00 · 30bc94566e
commit 30bc94566e
parent 4cba84b5d6 5f46ce14bd
25 changed files with 617 additions and 270 deletions
--- a/security/Kconfig
+++ b/security/Kconfig
--- a/security/commoncap.c
+++ b/security/commoncap.c
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
--- a/security/root_plug.c
+++ b/security/root_plug.c
--- a/security/security.c
+++ b/security/security.c
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
--- a/security/selinux/include/av_perm_to_string.h
+++ b/security/selinux/include/av_perm_to_string.h
--- a/security/selinux/include/av_permissions.h
+++ b/security/selinux/include/av_permissions.h
--- a/security/selinux/include/netlabel.h
+++ b/security/selinux/include/netlabel.h
--- a/security/selinux/include/netport.h
+++ b/security/selinux/include/netport.h
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
--- a/security/selinux/netport.c
+++ b/security/selinux/netport.c
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
--- a/security/selinux/ss/policydb.h
+++ b/security/selinux/ss/policydb.h
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c