From patchwork Wed Jun 28 17:57:30 2023 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: 113991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9117123vqr; Wed, 28 Jun 2023 11:12:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5AIkJ2RiZIKOQS4sqRfEhnAFofgVi/43UEycCU3uhZpZ29C2t6LY0wruIgMsBOnrfFnoLC X-Received: by 2002:a05:6402:5202:b0:51d:ab6c:c2b4 with SMTP id s2-20020a056402520200b0051dab6cc2b4mr5309917edd.0.1687975925869; Wed, 28 Jun 2023 11:12:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687975925; cv=none; d=google.com; s=arc-20160816; b=zCGGV/xHchgxxCjlCFLVaQyN9maAprPmfxNtsbJzWHVrqcPfKy0deHNjB/g3nqGa7b Cfd1OrBmE/nv942pySei9U88j0iBkr5Gwd68boVUnQJJKO+fBQRE2jad+7fOGyt7km7M PiZBQpweodTykxuePDGWKc50ZfFiJjZj/9uoTHvCUYqQIwZjHS/g+l6X71/KbevEmY8X 8tl66LHglxj0GIKI6dS1VIitx3r3sysOtTqkA3tIhsPnJAxkVKnPMHD5u2lBNd5QgDkL G3wOJ6A86H2tE2J+4p+9yVs6Q29ni7C3dL+pZFh6qECsc9glAr4irt1QeuzgiWsqS+nq 1H5g== 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=0a90sDEwceiAfp13aKmqboGMCvBvnbpR9fhJ+VWYrSg=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=eFtf2TWAGijl93WDbJJxEWuti+Ox+Mt8qMdt32nQxFxbt2oZp34778/9VULkhwlbSJ SRzPM1Kk3hU1HQ5uiaWNtjyD3z9WgH176AzSd9L5LW5moX82y95IPPEjoh8Xh/z0ohZb aEtuFfXZdixqlA68n3f7iACi4Ay9b8J+gSjCQ4x614FOh1GYIlOhOmHUhfen4jhxft+S zuBXIESGtAdR2AQ3l2oXCs6ob4sePwcSjOr4BKEf8PFoNCsRmY6tfTkn9MlODe45QAUA v8e4xLsXLC+k99UnzThDc/RrOpNVpoq7nsBCj8c44TT8Zp4oe6z32i+8uBmJGyEQAJNY tQBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WG4eyi+y; 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 o9-20020a056402038900b0051dd3a8c400si564079edv.186.2023.06.28.11.11.39; Wed, 28 Jun 2023 11:12:05 -0700 (PDT) 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=WG4eyi+y; 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 S232342AbjF1R56 (ORCPT + 99 others); Wed, 28 Jun 2023 13:57:58 -0400 Received: from dfw.source.kernel.org ([139.178.84.217]:37780 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232491AbjF1R4h (ORCPT ); Wed, 28 Jun 2023 13:56:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B7E6E613F8; Wed, 28 Jun 2023 17:56:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58625C433C8; Wed, 28 Jun 2023 17:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974996; bh=ps8O/vvPqe7Ml4jiez90Tc0cMsCWoN+RGXBfPOYX34A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WG4eyi+y/ciMnIh9VHVyG7YzFresIOZuA2+mhnPV1La9FwqYgE2e01/tdVZObtSG6 Zsd6nqmm2hz+BeWguL/Jgp1VzbT6qpVOiKgHGfocitCOkmJUvV0FJMWCteaCVYBZDL owdOva+i9k46ziaBdY+Y8oKnAFxdE7v62qj12oHNFZyHUTxSEGxiw3m4DpC8gZm75b ZMTc4zObcE6hLBcpVmIRKet5ElUEPIItC/LF3xPd2hSKA3VE6YhFbT5P+evMcxxIpO 5pi38cjb+wnWTyDOUO5xJHRmPSmwVRjHSBzK2BpCBX2rmX4d6P/IGqBVNcsZcXK3kx /fteion7OzC/g== Date: Wed, 28 Jun 2023 11:57:30 -0600 From: "Gustavo A. R. Silva" To: aacraid@microsemi.com, "James E.J. Bottomley" , "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 09/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct sgmap64 Message-ID: <169a28c9e45d1f237308b1ca716122c5d0ee3488.1687974498.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1769971044697142540?= X-GMAIL-MSGID: =?utf-8?q?1769971044697142540?= Replace one-element array with flexible-array member in struct sgmap64 and refactor the rest of the code, accordingly. Issue found with the help of Coccinelle and audited and fixed, manually. Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/ClangBuiltLinux/linux/issues/1851 Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/scsi/aacraid/aachba.c | 9 +++------ drivers/scsi/aacraid/aacraid.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index b2849e5cc104..90df697e7c5f 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1301,8 +1301,7 @@ static int aac_read_block64(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u if (ret < 0) return ret; fibsize = sizeof(struct aac_read64) + - ((le32_to_cpu(readcmd->sg.count) - 1) * - sizeof (struct sgentry64)); + le32_to_cpu(readcmd->sg.count) * sizeof(struct sgentry64); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); /* @@ -1433,8 +1432,7 @@ static int aac_write_block64(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, if (ret < 0) return ret; fibsize = sizeof(struct aac_write64) + - ((le32_to_cpu(writecmd->sg.count) - 1) * - sizeof (struct sgentry64)); + le32_to_cpu(writecmd->sg.count) * sizeof(struct sgentry64); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); /* @@ -2271,8 +2269,7 @@ int aac_get_adapter_info(struct aac_dev* dev) dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size - sizeof(struct aac_fibhdr) - - sizeof(struct aac_write64) + - sizeof(struct sgentry64)) / + sizeof(struct aac_write64)) / sizeof(struct sgentry64); } else { dev->a_ops.adapter_read = aac_read_block; diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 3fbc22ae72b6..fb3d93e4a99e 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -517,7 +517,7 @@ struct user_sgmap { struct sgmap64 { __le32 count; - struct sgentry64 sg[1]; + struct sgentry64 sg[]; }; struct user_sgmap64 {