From patchwork Mon Apr 20 23:30:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6244931 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A95919F313 for ; Mon, 20 Apr 2015 23:32:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7C4320266 for ; Mon, 20 Apr 2015 23:32:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E785820421 for ; Mon, 20 Apr 2015 23:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753167AbbDTXb0 (ORCPT ); Mon, 20 Apr 2015 19:31:26 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34914 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750753AbbDTXbW (ORCPT ); Mon, 20 Apr 2015 19:31:22 -0400 Received: by pabtp1 with SMTP id tp1so221790427pab.2; Mon, 20 Apr 2015 16:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=F05VfMckM3V/xBRP8Pg+1h5cfl0XX0kbTqazh7hJ9r0=; b=HgdJs5Kik7RHGm1nTVmF9E81ofxQLSqMs77Zz6D/eTK1tqryES9pDw0Xyq93AQpirl 4ug36spHuDDtZhug4fWlP0MRq08EJ9meX1k7f4zwBKX/S0Nd7WQD20Zom5j+yvfELZyi wuoCyzLdVEIAreUalf5OQG2yo/pYEpzeZgw7iMC873PJ3bhAT9Ikf+ci6+OvP8Nra788 vZi2Arn9Uj/B/r8Irp+wPhGLBTB8RwISxsm0ANCGbqGcsg/9+iQ7Ut2tgWfIXr/ETp12 j7xxPnxGQhaid05eoea47cA9MxSsJkTsvkEm0t/tUGZyY2AcHxDyhJg7BjWNx+S8Fy8a S+Yg== X-Received: by 10.70.134.35 with SMTP id ph3mr19345529pdb.91.1429572681756; Mon, 20 Apr 2015 16:31:21 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id md2sm75863pbc.13.2015.04.20.16.31.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 20 Apr 2015 16:31:20 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 20 Apr 2015 16:31:18 -0700 From: "Luis R. Rodriguez" 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" , Jani Nikula , Christoph Hellwig , Andrew Morton , Geert Uytterhoeven , Hannes Reinecke , Tejun Heo , Ingo Molnar 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 Message-Id: <1429572637-30234-3-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1429572637-30234-1-git-send-email-mcgrof@do-not-panic.com> References: <1429572637-30234-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" 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 Cc: Jani Nikula Cc: Christoph Hellwig Cc: Andrew Morton Cc: Geert Uytterhoeven Cc: Hannes Reinecke Cc: Kees Cook Cc: Tejun Heo Cc: Ingo Molnar Cc: cocci@systeme.lip6.fr Cc: linux-kernel@vger.kernel.org Signed-off-by: Luis R. Rodriguez --- 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 = {