Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp3216567ybb; Mon, 6 Apr 2020 04:39:25 -0700 (PDT) X-Google-Smtp-Source: APiQypItH+CkyzuFDleYSZf28tLcNBkNgjJ/cStxpwJJCiAz0u9Df9bsZH2Rli3O6JiNXh60BuDj X-Received: by 2002:aca:3b41:: with SMTP id i62mr11750582oia.55.1586173165155; Mon, 06 Apr 2020 04:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586173165; cv=none; d=google.com; s=arc-20160816; b=nwgqKHJ+W2srGsiz1uPP3nOG4eNWdh8pzVhg0jwLFzh5yil0QjYNoKUmk1YaI6qcNJ I5dugDaIA9fkaY7KXTxyLyScq9PpyLYhshPMuTg4hSYPgHn6N16TLGOkYbUOrxr24uQ3 RYm3Yk7dFR+5qXFpc+9O81vHMPhf3+mRJFthfdqWmtg4ElANMCbbSp2DLUGrk7V9FnGk a1I1IotFNogHm7BS+8oxwJHeGQ7kjzxd0Dj3JdkOr2iXEeTu2WbLbaOnfu/ZlqiKCKHJ +SYBxPqBq0xzJ2gxt2rLlAdN1uoy1g3LVlDFxclrm2tWVvCtHIzyR5BUJfqKi8S9mGmO oZZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=JWVM31tIlVlqdYPb/s+ojOKozH0/yamuDkExrKcuqlw=; b=QOJVF8B2jXZDlwAg7y4q3wvV6RYrZrG2eZE2VoPPsBaZzXHfsoLVnDFqRoCuUxjysg CvthNK9xbVVmubBSDjBfQFrhS4sxU185rQ39MK2XUB8lGJW7ztBZoO8MO26N8pXzPf+b CYH2SQv/si8ppxHBXXXCCVt0odfOrGby469YeRhBVjbgCJ21jlYzukjt1gcy0ws4Mtmc jPfbbSC7yG7vNk2qA1i6csaz+aiMw4Z294UBxj15TrIA7zYeWRtlAL8xyK9kyza91h7Z hlGQeEC+kXRI8mOdpr57lWZTOoOAF9kw5pIH5c9Yiu6Z5cjEU9iWPPivwee9wnKz6YOP g2EQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m21si5834963otn.66.2020.04.06.04.39.12; Mon, 06 Apr 2020 04:39:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727356AbgDFLiv (ORCPT + 99 others); Mon, 6 Apr 2020 07:38:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:55218 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgDFLiv (ORCPT ); Mon, 6 Apr 2020 07:38:51 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C68BFAE2D; Mon, 6 Apr 2020 11:38:48 +0000 (UTC) Subject: Re: [PATCH 01/11] EDAC/mc: Use int type for parameters of edac_mc_alloc() To: Robert Richter , Borislav Petkov , Mauro Carvalho Chehab , Tony Luck Cc: James Morse , Aristeu Rozanski , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200306151318.17422-1-rrichter@marvell.com> <20200306151318.17422-2-rrichter@marvell.com> From: Matthias Brugger Message-ID: Date: Mon, 6 Apr 2020 13:38:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200306151318.17422-2-rrichter@marvell.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/03/2020 16:13, Robert Richter wrote: > Most iterators use int type as index. mci->mc_idx is also type int. So > use int type for parameters of edac_mc_alloc(). Extend the range check > to check for negative values. There is a type cast now when assigning > variable n_layers to mci->n_layer, it is safe due to the range check. > > While at it, rename the users of edac_mc_alloc() to mc_idx as this > fits better here. > > Signed-off-by: Robert Richter Reviewed-by: Matthias Brugger > --- > drivers/edac/edac_mc.c | 7 +++---- > drivers/edac/edac_mc.h | 6 +++--- > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c > index 75ede27bdf6a..8bd3d00b4385 100644 > --- a/drivers/edac/edac_mc.c > +++ b/drivers/edac/edac_mc.c > @@ -444,8 +444,7 @@ static int edac_mc_alloc_dimms(struct mem_ctl_info *mci) > return 0; > } > > -struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > - unsigned int n_layers, > +struct mem_ctl_info *edac_mc_alloc(int mc_idx, int n_layers, > struct edac_mc_layer *layers, > unsigned int sz_pvt) > { > @@ -456,7 +455,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > void *pvt, *ptr = NULL; > bool per_rank = false; > > - if (WARN_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0)) > + if (WARN_ON(mc_idx < 0 || n_layers < 1 || n_layers > EDAC_MAX_LAYERS)) > return NULL; > > /* > @@ -505,7 +504,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL; > > /* setup index and various internal pointers */ > - mci->mc_idx = mc_num; > + mci->mc_idx = mc_idx; > mci->tot_dimms = tot_dimms; > mci->pvt_info = pvt; > mci->n_layers = n_layers; > diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h > index 881b00eadf7a..4815f50afea0 100644 > --- a/drivers/edac/edac_mc.h > +++ b/drivers/edac/edac_mc.h > @@ -98,7 +98,7 @@ do { \ > /** > * edac_mc_alloc() - Allocate and partially fill a struct &mem_ctl_info. > * > - * @mc_num: Memory controller number > + * @mc_idx: Memory controller number > * @n_layers: Number of MC hierarchy layers > * @layers: Describes each layer as seen by the Memory Controller > * @sz_pvt: size of private storage needed > @@ -122,8 +122,8 @@ do { \ > * On success, return a pointer to struct mem_ctl_info pointer; > * %NULL otherwise > */ > -struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > - unsigned int n_layers, > +struct mem_ctl_info *edac_mc_alloc(int mc_idx, > + int n_layers, > struct edac_mc_layer *layers, > unsigned int sz_pvt); > >