From patchwork Fri Nov 18 23:47:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 23150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp488826wrr; Fri, 18 Nov 2022 16:47:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf56UZX3dZJ0Ydpcqh7dqeEU8LpF9mK9fIp4vX1G1B0z5S6a10NalZWAl3ZstWlmDxAfiDlR X-Received: by 2002:a17:906:1844:b0:77a:4bfe:d6df with SMTP id w4-20020a170906184400b0077a4bfed6dfmr8091666eje.396.1668818831745; Fri, 18 Nov 2022 16:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818831; cv=none; d=google.com; s=arc-20160816; b=XKTC6/naARWbe8RRR+3vYp6Spc8DjKcjN7LCtawquQeR3oPCd/lnAlvLdyd/ZsHLaD OmMjDYqW7OLr4bwAltHpXdk9nJxKs4V8iFnlFfBQKYwCVsdic73aF5prFoN7dkk5R/MZ ICKjJdDWvOYlCE5mngB5XBatNHrkwXoMwMwNUeVEb8w+uZBgF/BPB08bHS/p+GuzWgLL V3B2fHgjwnW0fHLscjpY+hjm76awy71al9IqmoD5yhIb6Xru5W8aj33BZMtH1iDEgKQw mGmIkI8l4xQ2UaLuDvqNuTwGlJ7MigwXcH/+SOPUqQgZ8cpwm8bcRF5IfQ9GalBRS2Gu uKmQ== 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=a8EPVegW8Tov/65n6AFN41WmSatZhAp+BVgZyCgOzyo=; b=kcpMQglzO0OfpXF2lOwNYW1I0jm4lu82zSKyYt/XCXd5XKWmYXFP7J17Vp2gopWsXO pYkRnlLDbTkWNXj48qoQ94X3SD8llFqAod+qBLuSJgtiDe+kTibQ3iCq+nnLE2UvYm3U hy5VxPeogJPYtHWJXLS8Rriftd0kYuzuDOQ+Q5TTojioeV7LHu5y8QznSBuAD3KMwP0U o6w6Eyvnuzn3ARR2bzB+EFSQaYX7JYncJNR5K2czWdo4or/FE1acuYYilLlIwVn3eE5l OjqSyV8AwrdqnwWTwDL0R0B5SYONOGJJanC9y0xdEqRvzwzaXmV7ppfOyAItzAhS0bUB oYLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hBIzxcJR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v22-20020a056402349600b00467570d605esi4521084edc.608.2022.11.18.16.46.45; Fri, 18 Nov 2022 16:47:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hBIzxcJR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S238045AbiKSAqK (ORCPT + 99 others); Fri, 18 Nov 2022 19:46:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237352AbiKSApo (ORCPT ); Fri, 18 Nov 2022 19:45:44 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 802B1DAD0E; Fri, 18 Nov 2022 15:48:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 39F19B8248E; Fri, 18 Nov 2022 23:48:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01D67C433C1; Fri, 18 Nov 2022 23:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668815290; bh=V6o1820BomTbYwPBPVjRJZa37GdSnz96MLHX9Zwoc3Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hBIzxcJR6aLIxyVUmvLdDSGGutCg/6lET7G/314fgO3kvLNmmF8kKssti9L7Fol2F X17ZYJcubbxZvm7nAGmAJ1n0ElFvafZUOmFBXtAquLbYodrSwzncW+SR4q0zI4/xsn EzoZZb2RAJ6CAVBAD0sYcblNDKCIpBw4eJ16FLgBecV9ZNJqZD2DeLJBXuhacHlTeW o8UI0rd4BgJ6a4J4QXcvVWhc+bXDU3lNuWVxnJKt32gD54K6GI3NvGqJTnEzsxGgJQ mpPdXqLwHyYtigG2PEvXMsTp5mpcPC/mMQL/7/smpB53PMJXRI7/nRGOi52pdmdDvn qB5irgaJNHK6w== Date: Fri, 18 Nov 2022 17:47:56 -0600 From: "Gustavo A. R. Silva" To: "Martin K. Petersen" , "James E.J. Bottomley" , GR-QLogic-Storage-Upstream@marvell.com, Nilesh Javali Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 2/2][next] scsi: qla2xxx: Use struct_size() in code related to struct ct_sns_gpnft_rsp Message-ID: <9bd4775fe9c88b33c3194f841a2ec2f559d58032.1668814746.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749883375376903979?= X-GMAIL-MSGID: =?utf-8?q?1749883375376903979?= Prefer struct_size() over open-coded versions of idiom: sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count where count is the max number of items the flexible array is supposed to contain. Link: https://github.com/KSPP/linux/issues/160 Signed-off-by: Gustavo A. R. Silva --- drivers/scsi/qla2xxx/qla_gs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 69d3bc795f90..27e1df56b0fb 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -4072,9 +4072,8 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) } sp->u.iocb_cmd.u.ctarg.req_size = GPN_FT_REQ_SIZE; - rspsz = sizeof(struct ct_sns_gpnft_rsp) + - (vha->hw->max_fibre_devices * - sizeof(struct ct_sns_gpn_ft_data)); + rspsz = struct_size((struct ct_sns_gpnft_rsp *)0, entries, + vha->hw->max_fibre_devices); sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev, rspsz,