From: John Johansen <john.johansen@canonical.com>
Date: Thu, 30 Mar 2017 12:25:23 +0000 (-0700)
Subject: apparmor: provide information about path buffer size at boot
X-Git-Tag: v4.13-rc1~161^2~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39d84824eae3b1348408237173c710473e726ca9;p=karo-tx-linux.git

apparmor: provide information about path buffer size at boot

Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index a128f1772135..8ab00c98613f 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -774,11 +774,18 @@ static int param_get_aabool(char *buffer, const struct kernel_param *kp)
 
 static int param_set_aauint(const char *val, const struct kernel_param *kp)
 {
+	int error;
+
 	if (!apparmor_enabled)
 		return -EINVAL;
-	if (apparmor_initialized && !policy_admin_capable(NULL))
+	/* file is ro but enforce 2nd line check */
+	if (apparmor_initialized)
 		return -EPERM;
-	return param_set_uint(val, kp);
+
+	error = param_set_uint(val, kp);
+	pr_info("AppArmor: buffer size set to %d bytes\n", aa_g_path_max);
+
+	return error;
 }
 
 static int param_get_aauint(char *buffer, const struct kernel_param *kp)