From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com> To: rusty@rustcorp.com.au Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, keescook@chromium.org, casey@schaufler-ca.com, cocci@systeme.lip6.fr, "Luis R. Rodriguez" <mcgrof@suse.com>, Jani Nikula <jani.nikula@intel.com>, Christoph Hellwig <hch@infradead.org>, Andrew Morton <akpm@linux-foundation.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Hannes Reinecke <hare@suse.de>, Tejun Heo <tj@kernel.org>, Ingo Molnar <mingo@kernel.org> Subject: [PATCH v1 2/6] kernel/module.c: use generic module param operaters for sig_enforce Date: Mon, 20 Apr 2015 16:30:33 -0700 [thread overview] Message-ID: <1429572637-30234-3-git-send-email-mcgrof@do-not-panic.com> (raw) In-Reply-To: <1429572637-30234-1-git-send-email-mcgrof@do-not-panic.com> From: "Luis R. Rodriguez" <mcgrof@suse.com> 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: Christoph Hellwig <hch@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Hannes Reinecke <hare@suse.de> Cc: Kees Cook <keescook@chromium.org> Cc: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: cocci@systeme.lip6.fr Cc: linux-kernel@vger.kernel.org Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> --- kernel/module.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 42a1d2a..de12c4a 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -114,23 +114,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 = { -- 2.3.2.209.gd67f9d5.dirty
WARNING: multiple messages have this Message-ID (diff)
From: mcgrof@do-not-panic.com (Luis R. Rodriguez) To: cocci@systeme.lip6.fr Subject: [Cocci] [PATCH v1 2/6] kernel/module.c: use generic module param operaters for sig_enforce Date: Mon, 20 Apr 2015 16:30:33 -0700 [thread overview] Message-ID: <1429572637-30234-3-git-send-email-mcgrof@do-not-panic.com> (raw) In-Reply-To: <1429572637-30234-1-git-send-email-mcgrof@do-not-panic.com> From: "Luis R. Rodriguez" <mcgrof@suse.com> 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: Christoph Hellwig <hch@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Hannes Reinecke <hare@suse.de> Cc: Kees Cook <keescook@chromium.org> Cc: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: cocci at systeme.lip6.fr Cc: linux-kernel at vger.kernel.org Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> --- kernel/module.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 42a1d2a..de12c4a 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -114,23 +114,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 = { -- 2.3.2.209.gd67f9d5.dirty
next prev parent reply other threads:[~2015-04-20 23:31 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-20 23:30 [PATCH v1 0/6] module params: few simplifications Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez 2015-04-20 23:30 ` Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez 2015-04-21 10:20 ` Arend van Spriel 2015-04-21 10:20 ` [Cocci] " Arend van Spriel 2015-04-20 23:30 ` Luis R. Rodriguez [this message] 2015-04-20 23:30 ` [Cocci] [PATCH v1 2/6] kernel/module.c: use generic module param operaters for sig_enforce Luis R. Rodriguez 2015-04-20 23:30 ` [PATCH v1 3/6] kernel/params.c: generalize bool_enable_only Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez 2015-04-20 23:30 ` [PATCH v1 4/6] moduleparam.h: add module_param_config_*() helpers Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez 2015-04-20 23:42 ` Julian Calaby 2015-04-20 23:42 ` [Cocci] " Julian Calaby 2015-04-21 16:41 ` Luis R. Rodriguez 2015-04-21 16:41 ` [Cocci] " Luis R. Rodriguez 2015-04-21 15:21 ` Tejun Heo 2015-04-21 15:21 ` [Cocci] " Tejun Heo 2015-04-21 16:55 ` Luis R. Rodriguez 2015-04-21 16:55 ` [Cocci] " Luis R. Rodriguez 2015-04-21 20:58 ` Tejun Heo 2015-04-21 20:58 ` [Cocci] " Tejun Heo 2015-04-22 7:15 ` Rusty Russell 2015-04-22 7:15 ` [Cocci] " Rusty Russell 2015-04-22 15:42 ` Luis R. Rodriguez 2015-04-20 23:30 ` [PATCH v1 5/6] kernel/workqueue.c: use module_param_config_on_off() for power_efficient Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez 2015-04-20 23:30 ` [PATCH v1 6/6] kernel/module.c: use module_param_config_on() for sig_enforce Luis R. Rodriguez 2015-04-20 23:30 ` [Cocci] " Luis R. Rodriguez
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1429572637-30234-3-git-send-email-mcgrof@do-not-panic.com \ --to=mcgrof@do-not-panic.com \ --cc=akpm@linux-foundation.org \ --cc=casey@schaufler-ca.com \ --cc=cocci@systeme.lip6.fr \ --cc=geert@linux-m68k.org \ --cc=hare@suse.de \ --cc=hch@infradead.org \ --cc=jani.nikula@intel.com \ --cc=keescook@chromium.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=mcgrof@suse.com \ --cc=mingo@kernel.org \ --cc=rusty@rustcorp.com.au \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.