Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756868Ab3ETNqY (ORCPT ); Mon, 20 May 2013 09:46:24 -0400 Received: from relay1.sgi.com ([192.48.179.29]:43301 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756443Ab3ETNqX (ORCPT ); Mon, 20 May 2013 09:46:23 -0400 Date: Mon, 20 May 2013 08:46:21 -0500 From: Dimitri Sivanich To: Dan Carpenter Cc: Robin Holt , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [patch] gru: fix a sanity test in gru_set_context_option() Message-ID: <20130520134621.GA25574@sgi.com> References: <20130519125950.GA17651@elgon.mountain> <20130519144442.GA8926@sgi.com> <20130519183041.GB30128@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130519183041.GB30128@mwanda> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2408 Lines: 57 On Sun, May 19, 2013 at 09:30:41PM +0300, Dan Carpenter wrote: > On Sun, May 19, 2013 at 09:44:42AM -0500, Dimitri Sivanich wrote: > > > > Since we're here, maybe we should neaten this up a little? > > > > Signed-off-by: Dimitri Sivanich > > --- > > drivers/misc/sgi-gru/grufault.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > Index: linux/drivers/misc/sgi-gru/grufault.c > > =================================================================== > > --- linux.orig/drivers/misc/sgi-gru/grufault.c > > +++ linux/drivers/misc/sgi-gru/grufault.c > > @@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long > > switch (req.op) { > > case sco_blade_chiplet: > > /* Select blade/chiplet for GRU context */ > > - if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] || > > - req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) { > > + if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB || > > + req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || > > + (req.val1 >= 0 && !gru_base[req.val1])) { > > ret = -EINVAL; > > I generally prefer how in the original code all the sub conditions > were aligned nicely but I will Ack your version as well. Thanks. > I guess I'd have to agree. How about this? Signed-off-by: Dimitri Sivanich --- drivers/misc/sgi-gru/grufault.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux/drivers/misc/sgi-gru/grufault.c =================================================================== --- linux.orig/drivers/misc/sgi-gru/grufault.c +++ linux/drivers/misc/sgi-gru/grufault.c @@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long switch (req.op) { case sco_blade_chiplet: /* Select blade/chiplet for GRU context */ - if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] || - req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) { + if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB || + req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || + (req.val1 >= 0 && !gru_base[req.val1])) { ret = -EINVAL; } else { gts->ts_user_blade_id = req.val1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/