From patchwork Wed Jun 28 17:54:27 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: 113995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9123522vqr; Wed, 28 Jun 2023 11:23:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Ts7ed4Sb2HXohZIbgyB0SV1vX/NftVkGOfL7YFXFKhN8CRrNkbVCnY2QHnKryXkZEkR1A X-Received: by 2002:ac2:5228:0:b0:4fb:7381:952e with SMTP id i8-20020ac25228000000b004fb7381952emr5827420lfl.2.1687976617512; Wed, 28 Jun 2023 11:23:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687976617; cv=none; d=google.com; s=arc-20160816; b=JNC7bmUNfFAVEELSmh9TONvLJ3N4Pmem/BkBLJMpFsyTjVjd3ikKhm3rGRAdSypZCG 5FflT9sptEyeh/jNOVM592PY1UWdLX45xMldMpeTTkEc8uV0bPz2a/g3uxlT5e1La9Q+ m4A0J8EXu39kZrIYHteI/97MyYc3tNxuL27EuB6cAkTSbudnbmcaPd8RC/VFhXyZiRic pDa4v8J88z7/RoTefrP85C83v8sbxkTA8M04l5gr5UxCUSAiaKYQlMaK7Vjy1FoKxAa6 AZApgP5XKTC5tg9et9+OPbrARQ/jmuF3/TBE5iq2823WwS1pV6bV4FzEfjnWeNG0Fjco BCxQ== 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=PNEZsc+qtiMfn6JXMP6uqDl/7YLsWkWO26GAT07FaKc=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=R+hUKmAxHnBtlhYiR6D5jm3I9trNMUZhrvTP9/e0cvzEHFWVmgdKwsb+hM+RNxjR/7 4MM2n1/iCJSx9Ak6cSKlvJEpgtSrXKUaz7N3A3DMbtZFsQlbLptgqXQIfKvvnekxo3Pt Fr6JZ7iacxUuP4n10ylCo/cbvV3KHSlqpS1XzXZ+HhITges/WNJ5/dMrIkFAojeQPMS5 REGKRvDERpEuFney9UVIKaqHYuNJkFhZaIaJldxY4xhhxODv6qBChbIR+ZXmRz0FGJ42 kW3QwQxAquKT2s1+9KdHtQbGi4wEzxwoetMaCd62Xk3x0NJNuaaeesCohAyE7vx54RYJ moGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i2dAsDjr; 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 x4-20020aa7d384000000b0051d9bf001fasi3705217edq.374.2023.06.28.11.23.13; Wed, 28 Jun 2023 11:23:37 -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=i2dAsDjr; 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 S231865AbjF1Rxj (ORCPT + 99 others); Wed, 28 Jun 2023 13:53:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjF1Rxe (ORCPT ); Wed, 28 Jun 2023 13:53:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC1FD8; Wed, 28 Jun 2023 10:53:33 -0700 (PDT) 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 73F4C6141D; Wed, 28 Jun 2023 17:53:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03D96C433C8; Wed, 28 Jun 2023 17:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974812; bh=RiuIgkhu77zPv+WhGnYLVNRE1+8TYz1yHFT8B0EbRN0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=i2dAsDjrx2FY+7CZ6IaD3SGF1mVQ62NvOZP1ffXHdTe9MIH6sAVnOqt8muzuDFh6g +G8oPPveZdLQvXAexB57GUsz3YnFG+Jueo0lSfdNlzm9MaPHiEczuinsNkRr8QqP8t KAPxgiK9dXNI057IMDrfucA+DSq1aurAjjm1a6/sNHQW0krpZZQmd60TkYcarpZXGs 6me+kvVwZhdykmGSwYFAYgcY+Z1s23OqD9HNVJM5Rf217TawDV14bpq778VfGklorS TFWI3fVRQRFE1oBp/y65JaqYKx2TFnJbR7eBinkb+njJ+gfsnMZlYZ7jfFNz23kNn0 CiKdtBZV+Ahpw== Date: Wed, 28 Jun 2023 11:54:27 -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 01/10][next] scsi: aacraid: Replace one-element array with flexible-array member Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1769971770171088824?= X-GMAIL-MSGID: =?utf-8?q?1769971770171088824?= Replace one-element array with flexible-array member in struct aac_ciss_phys_luns_resp. This results in no differences in binary output. 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 | 2 +- drivers/scsi/aacraid/aacraid.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 70e1cac1975e..bba2d4d952ca 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1833,7 +1833,7 @@ static int aac_get_safw_ciss_luns(struct aac_dev *dev) struct aac_ciss_phys_luns_resp *phys_luns; datasize = sizeof(struct aac_ciss_phys_luns_resp) + - (AAC_MAX_TARGETS - 1) * sizeof(struct _ciss_lun); + AAC_MAX_TARGETS * sizeof(struct _ciss_lun); phys_luns = kmalloc(datasize, GFP_KERNEL); if (phys_luns == NULL) goto out; diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 7c6efde75da6..83fa890f28be 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -322,7 +322,7 @@ struct aac_ciss_phys_luns_resp { u8 level3[2]; u8 level2[2]; u8 node_ident[16]; /* phys. node identifier */ - } lun[1]; /* List of phys. devices */ + } lun[]; /* List of phys. devices */ }; /*