kernel.git/security/apparmor/lsm.c, branch linux-4.8.y

apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling

2016-07-27T07:39:26Z

The newly added Kconfig option could never work and just causes a build error when disabled: security/apparmor/lsm.c:675:25: error: 'CONFIG_SECURITY_APPARMOR_HASH_DEFAULT' undeclared here (not in a function) bool aa_g_hash_policy = CONFIG_SECURITY_APPARMOR_HASH_DEFAULT; The problem is that the macro undefined in this case, and we need to use the IS_ENABLED() helper to turn it into a boolean constant. Another minor problem with the original patch is that the option is even offered in sysfs when SECURITY_APPARMOR_HASH is not enabled, so this also hides the option in that case. Signed-off-by: Arnd Bergmann Fixes: 6059f71f1e94 ("apparmor: add parameter to control whether policy hashing is used") Signed-off-by: John Johansen Signed-off-by: James Morris

apparmor: fix arg_size computation for when setprocattr is null terminated

2016-07-12T15:43:10Z

Signed-off-by: John Johansen

apparmor: fix oops, validate buffer size in apparmor_setprocattr()

2016-07-12T15:43:10Z

When proc_pid_attr_write() was changed to use memdup_user apparmor's (interface violating) assumption that the setprocattr buffer was always a single page was violated. The size test is not strictly speaking needed as proc_pid_attr_write() will reject anything larger, but for the sake of robustness we can keep it in. SMACK and SELinux look safe to me, but somebody else should probably have a look just in case. Based on original patch from Vegard Nossum modified for the case that apparmor provides null termination. Fixes: bb646cdb12e75d82258c2f2e7746d5952d3e321a Reported-by: Vegard Nossum Cc: Al Viro Cc: John Johansen Cc: Paul Moore Cc: Stephen Smalley Cc: Eric Paris Cc: Casey Schaufler Cc: stable@kernel.org Signed-off-by: John Johansen Reviewed-by: Tyler Hicks Signed-off-by: James Morris

apparmor: fix module parameters can be changed after policy is locked

2016-07-12T15:43:10Z

the policy_lock parameter is a one way switch that prevents policy from being further modified. Unfortunately some of the module parameters can effectively modify policy by turning off enforcement. split policy_admin_capable into a view check and a full admin check, and update the admin check to test the policy_lock parameter. Signed-off-by: John Johansen

apparmor: add parameter to control whether policy hashing is used

2016-07-12T15:43:10Z

Signed-off-by: John Johansen Acked-by: Tyler Hicks Acked-by: Seth Arnold

constify security_path_{link,rename}

2016-03-28T04:47:36Z

Signed-off-by: Al Viro

apparmor: remove useless checks for NULL ->mnt

2016-03-28T04:47:28Z

Signed-off-by: Al Viro

constify security_path_{mkdir,mknod,symlink}

2016-03-28T04:47:27Z

... as well as unix_mknod() and may_o_create() Signed-off-by: Al Viro

constify security_path_{unlink,rmdir}

2016-03-28T04:47:27Z

Signed-off-by: Al Viro

apparmor: constify common_perm_...()

2016-03-28T04:47:26Z

Signed-off-by: Al Viro