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: SELinux: add more validity checks on policy load SELinux: fix bug in new ebitmap code. SELinux: suppress a warning for 64k pages.
Showing
- security/selinux/ss/avtab.c 28 additions, 4 deletionssecurity/selinux/ss/avtab.c
- security/selinux/ss/avtab.h 3 additions, 2 deletionssecurity/selinux/ss/avtab.h
- security/selinux/ss/conditional.c 2 additions, 1 deletionsecurity/selinux/ss/conditional.c
- security/selinux/ss/ebitmap.c 1 addition, 1 deletionsecurity/selinux/ss/ebitmap.c
- security/selinux/ss/mls.c 36 additions, 30 deletionssecurity/selinux/ss/mls.c
- security/selinux/ss/mls.h 2 additions, 0 deletionssecurity/selinux/ss/mls.h
- security/selinux/ss/policydb.c 44 additions, 1 deletionsecurity/selinux/ss/policydb.c
- security/selinux/ss/policydb.h 3 additions, 0 deletionssecurity/selinux/ss/policydb.h
- security/selinux/xfrm.c 7 additions, 6 deletionssecurity/selinux/xfrm.c
Loading
Please register or sign in to comment