Merge branch 'for-linus3' of...
Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX KEYS: Fix garbage collector KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent CRED: Allow put_cred() to cope with a NULL groups list SELinux: flush the avc before disabling SELinux SELinux: seperate avc_cache flushing Creds: creds->security can be NULL is selinux is disabled
Showing
- include/linux/cred.h 8 additions, 5 deletionsinclude/linux/cred.h
- include/linux/selinux.h 9 additions, 0 deletionsinclude/linux/selinux.h
- kernel/cred.c 2 additions, 1 deletionkernel/cred.c
- security/keys/gc.c 51 additions, 27 deletionssecurity/keys/gc.c
- security/keys/key.c 2 additions, 2 deletionssecurity/keys/key.c
- security/keys/keyctl.c 2 additions, 1 deletionsecurity/keys/keyctl.c
- security/keys/keyring.c 19 additions, 5 deletionssecurity/keys/keyring.c
- security/selinux/avc.c 19 additions, 7 deletionssecurity/selinux/avc.c
- security/selinux/exports.c 6 additions, 0 deletionssecurity/selinux/exports.c
Loading
Please register or sign in to comment