Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4020985pxb; Mon, 27 Sep 2021 07:46:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqhRXO08xeiTFECjxky/dBnJFzg0fYql8xwmHvdpDX9TRxdxW69Q+0gLUqYiwfJZMKkNlN X-Received: by 2002:a63:f410:: with SMTP id g16mr58322pgi.201.1632754011031; Mon, 27 Sep 2021 07:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632754011; cv=none; d=google.com; s=arc-20160816; b=d9SmzqkhlX5vCwqsMy5qA3ABQWnNQ/+YBvyzxVFIoUGbTpermH1Wfc5ZFk5wc4avRt GgHnMrFNnnXmmsYeEmrykuCv+ov6LTiEhvhj3QNdwxF9aD+UIIqnbI9RlTmFh+yAa9ab kIF10hEdIO5jrFoyBkEv9A4IfFIRQ+fwIxqq2npSZpWzeU5eu+3iGPQje3nZr847eMzF zai6/KyTji1qo7kg9LweDYDnu159a0EmY93cwwPSZEtmbi7ZtWjm7B3ozzXd5YBY32mS UexZrLB0/gcJ1F6BdzFORXO2r/cwMG7/F+1TXrSmJc0lmWi5MRJ6JGDOmxFEYYfO+fQA A7Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=/vG1+J8vkCym4gDtKqPwcCfg7zMoS9azD/HTc+cogOI=; b=SRlJ4OTRE2oFpWohW3PkxV7DmewTec95V40j6mm24xIeo+Mm5SnyTKEKk6jDdzGfOI If6BcudmRtgFwyVzaTlVwrafBSorkyvn05yRBnTDE9ylEU0ZIwf/zDEspniuj59JiJfF eaHAKSIX/Mh9MFV8wTmwU60L4+5Vo5o93/7+WtDietYx5s73XnQuK8X16wPZGNVsNTSC ypp6tISOjcDMIJpBX0gsEjPNJBuvYADNr+wgRCOoW4BomWky7JyfFKTT8OLNIa7Jcfxj MLoj4yy6zzV98Ks0GpMHIr1TYXASXgUQRmszj+eZ+ByebdcoE8jp1cMPeGpBma/yotTl n5aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="gRHZmq/q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x23si22050625pgf.148.2021.09.27.07.46.37; Mon, 27 Sep 2021 07:46:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="gRHZmq/q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234828AbhI0OqS (ORCPT + 99 others); Mon, 27 Sep 2021 10:46:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:45728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234799AbhI0OqR (ORCPT ); Mon, 27 Sep 2021 10:46:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0330960F11; Mon, 27 Sep 2021 14:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632753879; bh=LS1KhJETSb4nO4pMBC+bk3+dNekoa6bYzCm72KLLax0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gRHZmq/qvgs2J/H1gdpCgH2r7s1R+jHVoPA+PTVz2mpzidJvPhpshjb+C2QZ3OBCH Px3RSvx2uF1ff5F7smGu9zLxNHLPD01GvY30rQjJCKsrfneWZZH+4F+2yzY5vE0V+z h9Cd5jSssFwTsfc62WrcJsNr1iyMITBevbVqgxq68MzkB+KGdSZdC+z9YqiDJ+rno+ Tfj4AsZEpRgDJZys0O0G+1xr69BpHjKyiYm/XELsiX4C6IKprOsBMcTBmizxPcPATH pn/6/3+/a+Q580xiSNC4Vh1bATIssrxkQZQI+PzSt/J+9nUlwnnnBSxMyfC2yLHtia JmI1++8x4a4rw== Date: Mon, 27 Sep 2021 09:48:38 -0500 From: "Gustavo A. R. Silva" To: Len Baker Cc: Matthew Wilcox , Hannes Reinecke , "James E.J. Bottomley" , "Martin K. Petersen" , Kees Cook , linux-hardening@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] scsi: advansys: Prefer struct_size over open coded arithmetic Message-ID: <20210927144838.GA168427@embeddedor> References: <20210925114205.11377-1-len.baker@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210925114205.11377-1-len.baker@gmx.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Sep 25, 2021 at 01:42:05PM +0200, Len Baker wrote: > As noted in the "Deprecated Interfaces, Language Features, Attributes, > and Conventions" documentation [1], size calculations (especially > multiplication) should not be performed in memory allocator (or similar) > function arguments due to the risk of them overflowing. This could lead > to values wrapping around and a smaller allocation being made than the > caller was expecting. Using those allocations could lead to linear > overflows of heap memory and other misbehaviors. > > So, use the struct_size() helper to do the arithmetic instead of the > argument "size + count * size" in the kzalloc() function. > > This code was detected with the help of Coccinelle and audited and fixed > manually. > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments > > Signed-off-by: Len Baker Reviewed-by: Gustavo A. R. Silva > --- > Changelog v1 -> v2 > - Rebase against v5.15-rc2 Don't use mainline for these sorts of patches . Use linux-next instead: https://www.kernel.org/doc/man-pages/linux-next.html Thanks -- Gustavo > - Remove the unnecessary "size" variable (Gustavo A. R. Silva). > - Update the commit changelog to inform that this code was detected > using a Coccinelle script (Gustavo A. R. Silva). > > drivers/scsi/advansys.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c > index ffb391967573..e341b3372482 100644 > --- a/drivers/scsi/advansys.c > +++ b/drivers/scsi/advansys.c > @@ -7477,8 +7477,8 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, > return ASC_ERROR; > } > > - asc_sg_head = kzalloc(sizeof(asc_scsi_q->sg_head) + > - use_sg * sizeof(struct asc_sg_list), GFP_ATOMIC); > + asc_sg_head = kzalloc(struct_size(asc_sg_head, sg_list, use_sg), > + GFP_ATOMIC); > if (!asc_sg_head) { > scsi_dma_unmap(scp); > set_host_byte(scp, DID_SOFT_ERROR); > -- > 2.25.1 >