Patchwork [saucy,manta] UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users

login
register
mail settings
Submitter John Johansen
Date July 11, 2013, 8:27 a.m.
Message ID <51DE6C89.1090209@canonical.com>
Download mbox | patch
Permalink /patch/258324/
State New
Headers show

Comments

John Johansen - July 11, 2013, 8:27 a.m.
This fixes a bug in the current apparmor3 alpha2 sync, where none root
users can not query whether the apparmor module is enabled. It has been
incorporated into the apparmor dev tree and will be integrated as part
of the next sync, at which point this patch will be reverted.

BugLink: http://bugs.launchpad.net/bugs/1199912

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 security/apparmor/lsm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tim Gardner - July 11, 2013, 1:56 p.m.

Patch

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 28e0734..4e5b340 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1205,7 +1205,7 @@  module_param_named(paranoid_load, aa_g_paranoid_load, aabool,
 
 /* Boot time disable flag */
 static bool apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE;
-module_param_named(enabled, apparmor_enabled, aabool, S_IRUGO);
+module_param_named(enabled, apparmor_enabled, bool, S_IRUGO);
 
 /* Boot time to set use of default or unconfined as initial profile */
 bool aa_g_unconfined_init = CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT;