Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris: "Nothing major for this kernel, just maintenance updates" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits) apparmor: add the ability to report a sha1 hash of loaded policy apparmor: export set of capabilities supported by the apparmor module apparmor: add the profile introspection file to interface apparmor: add an optional profile attachment string for profiles apparmor: add interface files for profiles and namespaces apparmor: allow setting any profile into the unconfined state apparmor: make free_profile available outside of policy.c apparmor: rework namespace free path apparmor: update how unconfined is handled apparmor: change how profile replacement update is done apparmor: convert profile lists to RCU based locking apparmor: provide base for multiple profiles to be replaced at once apparmor: add a features/policy dir to interface apparmor: enable users to query whether apparmor is enabled apparmor: remove minimum size check for vmalloc() Smack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytes Smack: network label match fix security: smack: add a hash table to quicken smk_find_entry() security: smack: fix memleak in smk_write_rules_list() xattr: Constify ->name member of "struct xattr". ...
Showing
- fs/ocfs2/xattr.h 1 addition, 1 deletionfs/ocfs2/xattr.h
- include/linux/security.h 4 additions, 4 deletionsinclude/linux/security.h
- include/linux/xattr.h 1 addition, 1 deletioninclude/linux/xattr.h
- include/uapi/linux/reiserfs_xattr.h 1 addition, 1 deletioninclude/uapi/linux/reiserfs_xattr.h
- security/apparmor/Kconfig 12 additions, 0 deletionssecurity/apparmor/Kconfig
- security/apparmor/Makefile 6 additions, 1 deletionsecurity/apparmor/Makefile
- security/apparmor/apparmorfs.c 626 additions, 10 deletionssecurity/apparmor/apparmorfs.c
- security/apparmor/capability.c 5 additions, 0 deletionssecurity/apparmor/capability.c
- security/apparmor/context.c 5 additions, 11 deletionssecurity/apparmor/context.c
- security/apparmor/crypto.c 97 additions, 0 deletionssecurity/apparmor/crypto.c
- security/apparmor/domain.c 15 additions, 9 deletionssecurity/apparmor/domain.c
- security/apparmor/include/apparmor.h 6 additions, 0 deletionssecurity/apparmor/include/apparmor.h
- security/apparmor/include/apparmorfs.h 40 additions, 0 deletionssecurity/apparmor/include/apparmorfs.h
- security/apparmor/include/audit.h 0 additions, 1 deletionsecurity/apparmor/include/audit.h
- security/apparmor/include/capability.h 4 additions, 0 deletionssecurity/apparmor/include/capability.h
- security/apparmor/include/context.h 7 additions, 8 deletionssecurity/apparmor/include/context.h
- security/apparmor/include/crypto.h 36 additions, 0 deletionssecurity/apparmor/include/crypto.h
- security/apparmor/include/policy.h 153 additions, 65 deletionssecurity/apparmor/include/policy.h
- security/apparmor/include/policy_unpack.h 20 additions, 1 deletionsecurity/apparmor/include/policy_unpack.h
- security/apparmor/lib.c 0 additions, 5 deletionssecurity/apparmor/lib.c
Loading
Please register or sign in to comment