summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2013-08-20 15:33:20 +0930
committerRusty Russell <rusty@rustcorp.com.au>2013-08-20 15:37:44 +0930
commit5265fc6219ddbf8dfc9b18223448a4997fb06eae (patch)
treed6b0dca1389c126757eb1f629799f0973dfb4ffb /security/apparmor
parent0ce814096f388f6801587f01c1c5ee1d04e746b3 (diff)
downloadlinux-5265fc6219ddbf8dfc9b18223448a4997fb06eae.tar.gz
linux-5265fc6219ddbf8dfc9b18223448a4997fb06eae.tar.bz2
linux-5265fc6219ddbf8dfc9b18223448a4997fb06eae.zip
module/lsm: Have apparmor module parameters work with no args
The apparmor module parameters for param_ops_aabool and param_ops_aalockpolicy are both based off of the param_ops_bool, and can handle a NULL value passed in as val. Have it enable the new KERNEL_PARAM_FL_NOARGS flag to allow the parameters to be set without having to state "=y" or "=1". Cc: John Johansen <john.johansen@canonical.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/lsm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 2e2a0dd4a73f..e3a704c75ef6 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -666,6 +666,7 @@ static int param_set_aabool(const char *val, const struct kernel_param *kp);
static int param_get_aabool(char *buffer, const struct kernel_param *kp);
#define param_check_aabool param_check_bool
static struct kernel_param_ops param_ops_aabool = {
+ .flags = KERNEL_PARAM_FL_NOARG,
.set = param_set_aabool,
.get = param_get_aabool
};
@@ -682,6 +683,7 @@ static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp
static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp);
#define param_check_aalockpolicy param_check_bool
static struct kernel_param_ops param_ops_aalockpolicy = {
+ .flags = KERNEL_PARAM_FL_NOARG,
.set = param_set_aalockpolicy,
.get = param_get_aalockpolicy
};