summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@suse.com>2015-05-27 11:09:38 +0930
committerRusty Russell <rusty@rustcorp.com.au>2015-05-28 11:32:11 +0930
commit05f408dddb013168759cdb4cbd0ba4e189a9504d (patch)
tree4e736a5251ce53c9a8a6a0b903f2bd54ba2d9572
parent9c27847dda9cfae7c273cde62becf364f9fa9ea3 (diff)
downloadlinux-05f408dddb013168759cdb4cbd0ba4e189a9504d.tar.bz2
kernel/module.c: use generic module param operaters for sig_enforce
We're directly checking and modifying sig_enforce when needed instead of using the generic helpers. This prevents us from generalizing this helper so that others can use it. Use indirect helpers to allow us to generalize this code a bit and to make it a bit more clear what this is doing. Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Kees Cook <keescook@chromium.org> Cc: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: linux-kernel@vger.kernel.org Cc: cocci@systeme.lip6.fr Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--kernel/module.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel/module.c b/kernel/module.c
index c8da2a59ebf7..9e8c9305bba9 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -301,23 +301,25 @@ static bool sig_enforce = false;
static int param_set_bool_enable_only(const char *val,
const struct kernel_param *kp)
{
- int err;
- bool test;
+ int err = 0;
+ bool new_value;
+ bool orig_value = *(bool *)kp->arg;
struct kernel_param dummy_kp = *kp;
- dummy_kp.arg = &test;
+ dummy_kp.arg = &new_value;
err = param_set_bool(val, &dummy_kp);
if (err)
return err;
/* Don't let them unset it once it's set! */
- if (!test && sig_enforce)
+ if (!new_value && orig_value)
return -EROFS;
- if (test)
- sig_enforce = true;
- return 0;
+ if (new_value)
+ err = param_set_bool(val, kp);
+
+ return err;
}
static const struct kernel_param_ops param_ops_bool_enable_only = {