Merge tag 'apparmor-pr-2018-06-13' of...
Merge tag 'apparmor-pr-2018-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor Pull AppArmor updates from John Johansen: "Features - add support for mapping secids and using secctxes - add the ability to get a task's secid - add support for audit rule filtering Cleanups: - multiple typo fixes - Convert to use match_string() helper - update git and wiki locations in AppArmor docs - improve get_buffers macro by using get_cpu_ptr - Use an IDR to allocate apparmor secids Bug fixes: - fix '*seclen' is never less than zero - fix mediation of prlimit - fix memory leak when deduping profile load - fix ptrace read check - fix memory leak of rule on error exit path" * tag 'apparmor-pr-2018-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor: (21 commits) apparmor: fix ptrace read check apparmor: fix memory leak when deduping profile load apparmor: fix mediation of prlimit apparmor: fixup secid map conversion to using IDR apparmor: Use an IDR to allocate apparmor secids apparmor: Fix memory leak of rule on error exit path apparmor: modify audit rule support to support profile stacks apparmor: Add support for audit rule filtering apparmor: update git and wiki locations in AppArmor docs apparmor: Convert to use match_string() helper apparmor: improve get_buffers macro by using get_cpu_ptr apparmor: fix '*seclen' is never less than zero apparmor: fix typo "preconfinement" apparmor: fix typo "independent" apparmor: fix typo "traverse" apparmor: fix typo "type" apparmor: fix typo "replace" apparmor: fix typo "comparison" apparmor: fix typo "loosen" apparmor: add the ability to get a task's secid ...
Showing
- Documentation/admin-guide/LSM/apparmor.rst 3 additions, 3 deletionsDocumentation/admin-guide/LSM/apparmor.rst
- security/apparmor/audit.c 89 additions, 1 deletionsecurity/apparmor/audit.c
- security/apparmor/domain.c 1 addition, 1 deletionsecurity/apparmor/domain.c
- security/apparmor/include/audit.h 6 additions, 0 deletionssecurity/apparmor/include/audit.h
- security/apparmor/include/label.h 1 addition, 1 deletionsecurity/apparmor/include/label.h
- security/apparmor/include/path.h 16 additions, 17 deletionssecurity/apparmor/include/path.h
- security/apparmor/include/secid.h 14 additions, 3 deletionssecurity/apparmor/include/secid.h
- security/apparmor/label.c 7 additions, 8 deletionssecurity/apparmor/label.c
- security/apparmor/lib.c 1 addition, 1 deletionsecurity/apparmor/lib.c
- security/apparmor/lsm.c 35 additions, 15 deletionssecurity/apparmor/lsm.c
- security/apparmor/match.c 1 addition, 1 deletionsecurity/apparmor/match.c
- security/apparmor/mount.c 1 addition, 1 deletionsecurity/apparmor/mount.c
- security/apparmor/policy.c 5 additions, 2 deletionssecurity/apparmor/policy.c
- security/apparmor/resource.c 1 addition, 1 deletionsecurity/apparmor/resource.c
- security/apparmor/secid.c 132 additions, 19 deletionssecurity/apparmor/secid.c
Loading
Please register or sign in to comment