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 */ }; /* From patchwork Wed Jun 28 17:54:58 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: 113994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9123151vqr; Wed, 28 Jun 2023 11:22:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6PtSnZoRRhkESYSVOjOrLX0UPSi5HTU7kay6x9588ouI9wcbIUymdiknLTBxa8SVEUpOz6 X-Received: by 2002:a2e:8e37:0:b0:2b6:7c3a:6adc with SMTP id r23-20020a2e8e37000000b002b67c3a6adcmr308283ljk.5.1687976577904; Wed, 28 Jun 2023 11:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687976577; cv=none; d=google.com; s=arc-20160816; b=J0qKjJoEFsEQ4DODERPj8E6eHXVV/lEjEadTERUuslygB8vJUQFFkajSN8X9YeD42D SAjkYWpahbq+hNoWKHYCqJZ1qwBoVFwid5sn6ixZdGsHWnigdDxg41DbpTeGZP4RHOBC EhTDFjCvBmIu0DdQ1PYU3naQmRP1oZrFc439CGpMiw/qqo9Lex8wETFu4NtctqpiGj/M hWxXs1ujTTsS7sZLpjWiY3PYMZMBceQNS6aA5GC4IEVCXeiQIRN7pqwd0LNAooTJUhxg Q6BJUfCZ5IsrMVR3Je7a8MRQ+4zuv/laFimehyqFYpSiGbLTx2rt1xfT02UO4XJhdkv/ 5+3Q== 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=IK7OL7hiKYcI6HSBEDWCLMwXGQOcOsU/FzcxDSCrD4M=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=PYXXq27zC+36mQYOny82sRNOiBU+Xp7fS3bbgyZ3UkBkokpPy2qCnESfZGjdr3QZCH c4KN2Cp0GYnjn3Jg0y9Rl3D70rnG7Li4LdYj3M2Qu9jCBza91OFnesp1zitPcJ/ebMXx M2FfCGYYdZ1/XzvFzvbL137xYyLak8coVL4GYx/GNeNTOFbxk2QG85KtpmNLjbJLavfL x7n0U1fvuscG20LImVZ8qzVQhtQMFbPSIiIF4YFPBhswgE0gEzirDTXrsWcVAhTRnIPU FdOan5QuhjhJRU3mSFNccd95LlorCzGaIbxfknVhSqHJoqxzCkK0A0KwosFF5wRaaKcX Jz7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H3m7jv70; 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 e17-20020a170906081100b0096f53f61cc8si5832550ejd.967.2023.06.28.11.22.32; Wed, 28 Jun 2023 11:22:57 -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=H3m7jv70; 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 S232050AbjF1RyV (ORCPT + 99 others); Wed, 28 Jun 2023 13:54:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232072AbjF1RyF (ORCPT ); Wed, 28 Jun 2023 13:54:05 -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 EF0F21FE8; Wed, 28 Jun 2023 10:54:04 -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 851366141D; Wed, 28 Jun 2023 17:54:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F162C433C8; Wed, 28 Jun 2023 17:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974844; bh=oSRPOgHpNDB64XuYcsnvS74umcBXdshhYlA/hMOAXX8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=H3m7jv70ePbAmDUscA1F0AhYSYj7TOZVKgCeF01P64dnTgDXLMxvVR6PT4N6Fe5cS yi2yAQIJQVICsaInV50nOacomxIXbN/EA7ueM5VYALZZb/xMiOTGmOVr3qcutoFZaq Q4FI0gMtZo86BobjGg/qAv7HRb6PZ4MfAXFm0ceeDZE4uK2p1V4Oe1dAuJOw6N77TV 4bw2cBT5r9AbcHMwRg2rtonUVZ6Wdt9TiP4R1C8x51iSq8QVZOuchu28Uj0xN2Je1f 6THqWVmanj40ydMVnAllifZdpTzwKzJlbreJFrCwQtB42A9SpDxPSp7L90sG5JY63+ ikrYCgaxZe4Kg== Date: Wed, 28 Jun 2023 11:54:58 -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 02/10][next] scsi: aacraid: Use struct_size() helper in aac_get_safw_ciss_luns() 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?1769971728240782103?= X-GMAIL-MSGID: =?utf-8?q?1769971728240782103?= Prefer struct_size() over open-coded versions. This results in no differences in binary output. Link: https://github.com/KSPP/linux/issues/160 Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/scsi/aacraid/aachba.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index bba2d4d952ca..fff0550e02e4 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1832,8 +1832,7 @@ static int aac_get_safw_ciss_luns(struct aac_dev *dev) struct aac_srb_unit srbu; struct aac_ciss_phys_luns_resp *phys_luns; - datasize = sizeof(struct aac_ciss_phys_luns_resp) + - AAC_MAX_TARGETS * sizeof(struct _ciss_lun); + datasize = struct_size(phys_luns, lun, AAC_MAX_TARGETS); phys_luns = kmalloc(datasize, GFP_KERNEL); if (phys_luns == NULL) goto out; From patchwork Wed Jun 28 17:55:24 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: 113996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9123527vqr; Wed, 28 Jun 2023 11:23:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5NLNI88dsYav7K+W1q4KL5xhgLwebLjm/iNoMX4oQzYrqhKWKefdVJQtEs47Tg/crnZjn8 X-Received: by 2002:a17:906:77c6:b0:988:3171:df06 with SMTP id m6-20020a17090677c600b009883171df06mr25111892ejn.2.1687976617880; 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=okpW0rsJcX8XuIZFvZGHVb0LkLRh/7t2X7H15j0mtiNUhf3Qdp8zeIYLkZG2y0qCcD 3PnNBhvOTPMICXcDqjTI8sBIIQ0FiLCvWbccvUCUgCSgStmPZliA6UE2nIZNnI3z+yJH 5ZGcZA0PqTeo9foZHTBwq2TysBS9An+BjwnA3L45t3MF2lMKc4WptwYelBVBe7tSpgk/ UtakL+oRL/3sF6uUi5kLaM/5kq2rBkznJIO6DpRDVfI6chIqeNwqVVIaBrq0MDt97M+/ WR1EQ6J+FccPchQEW3N57OExa/SYNS38OwdNcNMPp6OJZbyB9OIkpf7ptHUuotamPrX7 VapQ== 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=dYiMRfS2c8vdSODcMhyvc/Ot1ysIF20ziPAc9sw1osA=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=I+K1+TrQZHMV4wpfhpKxpcA17Me9b/zbvyDLymP7dLM0WAPzxtuqQjMJl0CRd4lXsw fGv3gVsNNpgFrsKetcx2zX/65GNBsH5XacA19XSWb7Ucuu/YFtL2R1nhQsujU0oyMnhD Ub4IzydT3AqibIvSpO6vp0336oChQ+C+JkqGIHVaqtN5MViMtcOMdB/EaAqH+5VHkucU 8zrMdTv4aY09EgHyBXywrcx+J369fOzF41c4Al76FOkV4x8l0QPw62KaPHP7R+7PCcZG clrpUdhhiUPwulrSPoMYRgrMFEcPjmD7hODK5H60AvmSuF0+Rh+m1oC0guv06iU2b2GZ W4/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=drUR6x+k; 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 s5-20020a1709064d8500b00991d54db2b2si4018363eju.698.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=drUR6x+k; 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 S231732AbjF1RzV (ORCPT + 99 others); Wed, 28 Jun 2023 13:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232013AbjF1Ryg (ORCPT ); Wed, 28 Jun 2023 13:54:36 -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 167182704; Wed, 28 Jun 2023 10:54:31 -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 9C36A61426; Wed, 28 Jun 2023 17:54:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33042C433C0; Wed, 28 Jun 2023 17:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974870; bh=Bh4L2zCmi8co6ZKpNs0mjBEZPUkU4wABH1EONUGV4ko=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=drUR6x+k+t8/2hPL0PU77jfEmFxwI/9p/nmhLCpepsUyg8imTUiIrSHEitQ39pyf5 dQ6Mi9W1I8tCpaC636iTfWsmcupTbmrxBMXarmQYnzqp1Pou3/R0SUmtsQhYJOjDvy 8Wq7mBolcr/4mLGtxrrTSVunbtlIwBRLVqZ1x4Smg/En4x9EEEvSruh+Am68sBLON+ /Tj8m6Vcrqh+0+ne5Hr1CsIP/Y9egbkv9lVUjXUKXbD353UZv4iq1F3tzSx697BjCg +HXJO39pfxtnt4re3CmOAnW0jqHkXqPVGNFR00FZgY+idT08P01GxOMFRRTNJhyzPh l6EKX6oV4xUVw== Date: Wed, 28 Jun 2023 11:55:24 -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 03/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct aac_aifcmd Message-ID: <65907ee4083de62fbaadc5c2e6512e3828912d1b.1687974498.git.gustavoars@kernel.org> 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?1769971769775480491?= X-GMAIL-MSGID: =?utf-8?q?1769971769775480491?= Replace one-element array with flexible-array member in struct aac_aifcmd. 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/aacraid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 83fa890f28be..2e1623344327 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -2618,7 +2618,7 @@ struct aac_hba_info { struct aac_aifcmd { __le32 command; /* Tell host what type of notify this is */ __le32 seqnum; /* To allow ordering of reports (if necessary) */ - u8 data[1]; /* Undefined length (from kernel viewpoint) */ + u8 data[]; /* Undefined length (from kernel viewpoint) */ }; /** From patchwork Wed Jun 28 17:55:47 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: 113992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9122380vqr; Wed, 28 Jun 2023 11:21:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6x7tdaCBHXxaPdCtAOp7jgbWw5ax9QqaCAQS6mFb6inL+LsvBS5tZ6Ir2OMUaieKk1EyI4 X-Received: by 2002:a17:906:74cd:b0:987:f332:5329 with SMTP id z13-20020a17090674cd00b00987f3325329mr22983574ejl.1.1687976489457; Wed, 28 Jun 2023 11:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687976489; cv=none; d=google.com; s=arc-20160816; b=tUv/kAhmVYTRsmNvHLtOI6DuSZ+r4+eyLp6CanjY+9pA59j3a6ukb730my61a+SIxx DIiZbzmO8gZyVwTM/PyI/Y/GaigDWu6D8E2/+490QItdV/eZHaZ/GSUREB6vQdyjfukX LnlYe+SlhsfFuUPgS7lJfjzfz1uQV6R18lA8FLM+b8KRyq0bm1k2P752/ruKUElu5qsG Dw5i455oYhWLAW+ZokDKtaRitokxeoQ2FhV83gkOMkxoxo1wupDnEpUbPHaONbFVkMIl 4+Sz6RblcBJ20GjXOg+R4rcBa+g3RILMWudm8m9KQFRrs1kjRpnHf7/dlnPyeCOI1Kiq C6yw== 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=ZopqdX0YNL6QSXcmzByIH6cEEYrnRae1/zMV2jdCalg=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=IFNz9SUvplzIkc0y7H2s/WI/nz6VMCgREqoqs8vy/7mieUttK4fh9VI4Eu9gY07PQr FaXYvMR8UDPzC5cd9aWJhSZZYD0bdau96PPF0rBCOiURVSNFd/DeRyIxnypBGWgAcRga qN6taTJOWndZGQOYZ4LT9J4p62Dh5/dmyZIBrHP+RahfBF7cTkGZzZXruOtW81qZVu65 7zSZ8nCTHhMtJtzZpVK5xHSJRN0OGD2q263IchJ1Z1HzdmmYy56KOMdOFIGrxMvVLWyh RbEaMcTrXBtogWzLBVUekkDpcVEq6G5Bead/0Pib3/khmXAgnqt69d2FImAe+MGiL4F0 E1cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RmuxOHe4; 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 e17-20020a170906081100b0096f53f61cc8si5832550ejd.967.2023.06.28.11.21.03; Wed, 28 Jun 2023 11:21:29 -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=RmuxOHe4; 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 S232099AbjF1Rz0 (ORCPT + 99 others); Wed, 28 Jun 2023 13:55:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232123AbjF1Ryz (ORCPT ); Wed, 28 Jun 2023 13:54:55 -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 8C3A42681; Wed, 28 Jun 2023 10:54:54 -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 2247E6139D; Wed, 28 Jun 2023 17:54:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B536BC433C0; Wed, 28 Jun 2023 17:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974893; bh=plV4nM9kY1seEi2E6G5RifIXmBYxufGUPbUvfxDlnUI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RmuxOHe4Dp8GBzik4q7A9/cuR8XTkx2C/8mmbApEAIa5ixksWpREBzzySrOS0TJ/o C0w3iZlSmyxGeZ6dKYfAVMGNoAiDsv515TZsDLeO69ZrB0onpnXLkBBl7RcenAcuri +FuXQLbEHdWN5WqE54VrsCAz/5C7+xbFSekpCyD+2Xx8qNQE8Guc3AY6JRLwj07BW2 gy4Z5u8Az8XYuVEmSmlSwCsGQLn+ZFCpucxv0TlEF3AKvuM399EAb4TuYtGV8ZYhLE mov3A6XFmu1LUGwSsDlMzs1S1IpqXr5DFppJZjGAKEt0uAa2AYs5MIe+lk6lizC0pn tctk8Fk0j76bg== Date: Wed, 28 Jun 2023 11:55:47 -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 04/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct user_sgmapraw Message-ID: <4c2277b8aa3de8600c807ff8c995635f414161f9.1687974498.git.gustavoars@kernel.org> 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?1769971635373009793?= X-GMAIL-MSGID: =?utf-8?q?1769971635373009793?= Replace one-element array with flexible-array member in struct user_sgmapraw. 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/aacraid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 2e1623344327..d1fc1ce2e36d 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -532,7 +532,7 @@ struct sgmapraw { struct user_sgmapraw { u32 count; - struct user_sgentryraw sg[1]; + struct user_sgentryraw sg[]; }; struct creation_info From patchwork Wed Jun 28 17:56:12 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: 113987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9107310vqr; Wed, 28 Jun 2023 10:58:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4EsK1KZE3iekUC50dslItJPsrKESmVmI1es8hlAGZvsj4tIslOJXsCUIvqVziVOcvbiHaO X-Received: by 2002:a17:903:22c3:b0:1b8:17e8:5472 with SMTP id y3-20020a17090322c300b001b817e85472mr7171736plg.1.1687975123206; Wed, 28 Jun 2023 10:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687975123; cv=none; d=google.com; s=arc-20160816; b=Ux4oFL/9HnUACRgca7Cr6O3BxkyQ6axtC7r9A7Ex1KieFdkT49Xam1woE430KCMETu GGNgh9WZh5dC5v2HwynMad0HSJ750NG5eOA9ayMhWuN4L6NGrXFRJz4YDUfelBKD0VCu cOkQFC1YlmyKqEM0pwi1Qkg0T0fm7fUnXOQI7J+JHvAN/s77nYzj4ANVfow4PnOb6k7j sfxQDtra7osoF5R0O5wUObJwWq3NIjUPEX/JzdrQatzRSqiBYNfiJk/WgWfNMSGTqrgp kpT75xn3V5Fey0/vb3m9wh/KZjSlQ39MgOE2NbpjupF37a3JsBEJUiMbnu0vRjwANbSO 8hKg== 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=oDx92FAAYb1P/kXCC0mQFV+SypLLR3/m2/HOOyFKUtg=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=WCIPecQWwj2qUdcOqDmR+QVPHHO6PfkHAjwqzajacuV2B9wgJSASNu1ioS7r0+HM/r haqKnuteIRy42heiR1s/BKG/GD9lX+Et6ge02XRXPYLolk92Z9T642Bb+20vggBO41mf U1RHH5JxkbFkRmeJI8bF6VpzxBZ7Vy9lG6E9IKFeQTBnZlrN8Q5byeWvp5BTIHidyeeS bZjEvKxCuHw/rqR6rsD8XIBPO8hLj+o1vw1VN/TWcGCPRWltDr7Skw6T2Li3zRLgNa/s wL6j6V+j75NYzBWUTxg6xJFqIhW0JFM8YLUtTwdB7EhZeQ8F68y0/Hro/sLhb5nmgUHm z0dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jy3t3Ms+; 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 u6-20020a17090341c600b001a66c369e0fsi9923789ple.510.2023.06.28.10.58.29; Wed, 28 Jun 2023 10:58:43 -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=jy3t3Ms+; 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 S232403AbjF1Rzx (ORCPT + 99 others); Wed, 28 Jun 2023 13:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231346AbjF1RzU (ORCPT ); Wed, 28 Jun 2023 13:55:20 -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 5DABDED; Wed, 28 Jun 2023 10:55:19 -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 E7A46613F8; Wed, 28 Jun 2023 17:55:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83028C433C0; Wed, 28 Jun 2023 17:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974918; bh=0hu58kp2QVPpg0WUsZ39FkRVCtgHbTIBc4jqwasTzQI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jy3t3Ms+Hev97tgWKs7vJAFVzGHlfwRe716LzYvpe3e58vu247JuRAdmECUNjA7Ae s2ipJsRqzuSQjFycRI6VQPZNq5wofki/o/ibj2lS2DXkGUisJJrS8B6iqxkxjB6tE2 OEHJLpwJars1xgZA9lbL700/xoyPHeOk9cv1VRV5OVxllqZbpvobkG9GjS0eYhghRx S1Zi9rz9R7Ol3B8l6tAoECz8QSrhVc4QlTGx/uB8qsUTxX95Lzywg+AEVAHzrrHy6A qx9glc/ez3ULkJimnTS9phWFs2+mP8dXwzdzMMJKG8as+x+t/F28/eKnKIqcqeXOP8 EfN6CBtMU2vrQ== Date: Wed, 28 Jun 2023 11:56:12 -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 05/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct sgmapraw Message-ID: <9dfcdf55597a49ed7e19ba064f5be424b344e175.1687974498.git.gustavoars@kernel.org> 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?1769970202604834379?= X-GMAIL-MSGID: =?utf-8?q?1769970202604834379?= Replace one-element array with flexible-array member in struct sgmapraw. 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 | 4 ++-- drivers/scsi/aacraid/aacraid.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index fff0550e02e4..b3c0c2255e55 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1267,7 +1267,7 @@ static int aac_read_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3 return ret; command = ContainerRawIo; fibsize = sizeof(struct aac_raw_io) + - ((le32_to_cpu(readcmd->sg.count)-1) * sizeof(struct sgentryraw)); + le32_to_cpu(readcmd->sg.count) * sizeof(struct sgentryraw); } BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); @@ -1401,7 +1401,7 @@ static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u return ret; command = ContainerRawIo; fibsize = sizeof(struct aac_raw_io) + - ((le32_to_cpu(writecmd->sg.count)-1) * sizeof (struct sgentryraw)); + le32_to_cpu(writecmd->sg.count) * sizeof(struct sgentryraw); } BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index d1fc1ce2e36d..87015dd2abd9 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -527,7 +527,7 @@ struct user_sgmap64 { struct sgmapraw { __le32 count; - struct sgentryraw sg[1]; + struct sgentryraw sg[]; }; struct user_sgmapraw { From patchwork Wed Jun 28 17:56:31 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: 113989 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9110225vqr; Wed, 28 Jun 2023 11:02:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6fKkdOp99dGEuAhZUohwgoq5n3NxqN0LeXQ8XZehcg6fKUM91lIqxQPKG4ewhXHmyzAjGc X-Received: by 2002:a05:6a00:338b:b0:681:ed30:32e5 with SMTP id cm11-20020a056a00338b00b00681ed3032e5mr1290605pfb.0.1687975350213; Wed, 28 Jun 2023 11:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687975350; cv=none; d=google.com; s=arc-20160816; b=pO9p0oY/6NEg6KYMZLy8vsXoCNOubv7nHkM7fPk5p6fIHtUrWOgMPr+AKoNYnScgVx K9HVqYHmlPp2xGIaZjJ2788haYKOCYJTkuhV2HQvNkNda+7q0PxV55q8UJzAln4k5NvI DjqhRhdN/c3mZvqh0hB0XiAM/UuxoE3VoDsYSEh90wA3JqZduO/BNlZ0zZruj81RGlQV 8ta6c2rj9zaE0K9ZVEgThiFWbtWxaisFhNoNgjkyo7tMsb9ExWBSTwZYhlC16aKtBZYj RGfyPL5n8Z3iv/DKgw3UgLIVZcSsR+6Mt4ezJIvzPoTIeUwbh4pZuczBzVbpuqRvfDZs Whmw== 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=v9zD4lmo0c+jj+xheMk5RGeuLZZtPZ5jswOCjhDyw1I=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=Mo+LL4w2we0J1fyUe5zkOKjTjI+jaoYhe5ukjxUTqT+BJqeq0YnWW+0JIAo0wOHg0S ct0pWcqjmr8OslFNtIeiDf6x6vYU9E2iVZGbTzn7UsOfaqZ64ZfyDBOE/Xwxjtqu8Mzv T6tN099nW9/NhWX8dwbWI8jayBC552tJ0n2RNun5ekCrEOA1RpgvXih4DBbvBLwnKfGS MqDu4uhaYyj+bqhYosjVcVwOoiTVr6ZhaVctg2NBbW09670KLexHwj9fq+aW8+HXMvVv 0tpFBfoybBgv5Qvlz45cw0+8EMbPKoIxCbS2eejN55rKwoA1pwJff6Mxujm4nW5oB+8Q HlDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=a+poLz5i; 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 c2-20020a056a00248200b0066871b54e15si922932pfv.359.2023.06.28.11.02.13; Wed, 28 Jun 2023 11:02:30 -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=a+poLz5i; 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 S232246AbjF1R4Q (ORCPT + 99 others); Wed, 28 Jun 2023 13:56:16 -0400 Received: from dfw.source.kernel.org ([139.178.84.217]:37064 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232260AbjF1Rzi (ORCPT ); Wed, 28 Jun 2023 13:55:38 -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 3378161447; Wed, 28 Jun 2023 17:55:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C09A2C433CB; Wed, 28 Jun 2023 17:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974937; bh=7JUyr2dX63IraG+7yBFRgMvzzEv6qsJXwBtXtsyQIRg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=a+poLz5iSuMCS+/NCh2iMU0fnKSOL7K0254QTfODdY9ehKFz7PwZ0L1424dV6bpuP LazKhf9sGQAhwjY0vGc/YP9CSllExeuAk22cq1kcd5OpvjpMMYGSX22Fd2SgJsH3QM eUknnw01QGNcAYfq3Je4I1bvBkhtMWG/4P2AlqsCZzL4PsbHneJaaYYM+QYuqBPqEi 2lgDhdhdZweMvvV8udarefvKiJdLy37c42fM/6kgvqXqm6UC5pA0pGKz4Nyvoqfsnc RTvctdvyBTOVJj3Ua9ychfylMelEmD7e5rITvKO3qpvQj6FbkxPAUeXATeB8iMMnfg Dy1Hz6czDnb4A== Date: Wed, 28 Jun 2023 11:56:31 -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 06/10][next] scsi: aacraid: Use struct_size() helper in code related to struct sgmapraw Message-ID: 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?1769970440486310484?= X-GMAIL-MSGID: =?utf-8?q?1769970440486310484?= Prefer struct_size() over open-coded versions. Link: https://github.com/KSPP/linux/issues/160 Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/scsi/aacraid/aachba.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index b3c0c2255e55..03ba974f6b2a 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1266,8 +1266,7 @@ static int aac_read_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3 if (ret < 0) return ret; command = ContainerRawIo; - fibsize = sizeof(struct aac_raw_io) + - le32_to_cpu(readcmd->sg.count) * sizeof(struct sgentryraw); + fibsize = struct_size(readcmd, sg.sg, le32_to_cpu(readcmd->sg.count)); } BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); @@ -1400,8 +1399,7 @@ static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u if (ret < 0) return ret; command = ContainerRawIo; - fibsize = sizeof(struct aac_raw_io) + - le32_to_cpu(writecmd->sg.count) * sizeof(struct sgentryraw); + fibsize = struct_size(writecmd, sg.sg, le32_to_cpu(writecmd->sg.count)); } BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); From patchwork Wed Jun 28 17:56:52 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: 113988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9107579vqr; Wed, 28 Jun 2023 10:59:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Qrmm6g1waYyz/bCmaz6PMtMo4q1li7xmkUA7Ze3bPRk9i/uLURqsy6zLSJXCJc4HOfGdt X-Received: by 2002:a05:6a00:138d:b0:67d:308b:97ef with SMTP id t13-20020a056a00138d00b0067d308b97efmr5193674pfg.2.1687975154294; Wed, 28 Jun 2023 10:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687975154; cv=none; d=google.com; s=arc-20160816; b=UIu9DfBZZsLrZkAik5OBHf7Kk1tbIha13GSWtjEqkiQsbCkTp3XdkoWiDV5zLvwhjP xvNICrB9GP4Z5H/4iN3WPkxhCaPpKs1m68WcyL/p5p8qmzKSSgIuasTVUZB5MDvpCMzb p993COVZnlj6E8GY5dwzJ3bqIC/J/RxB2oDe2knrnKGZ1PicGDTV85A46i1Cu4EdNv2V 87iUa5Lm/NqoxNHs81wwPyLscU/YimwKfU2EewZbQXejj6YbnokGCOgNkh1blUBRhu/Z iWWBXpYrYoyn0x1BR2ODmWLTu39EwUN66IIdYgyUhxlV2k4A/w6sAds+13bc7uy57Sva iXTA== 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=1LSRtsJvhdu2zN79QaO182w8F8LZTZrw/UbUJ7jYlPo=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=AQHLKnrOQpJyOwa1OScddFoKOCX2YuFBYiz1eaVf+SHmZXuSjcFPB1oAoT36QBcz9c 7cUD79Gz0sEZ7hq5fwA32bq4qGX7emYjgS3X2lKRbIyoJoK3LWhCdzq4re0Z6lNCmksg hA2aKlAQJ1lgyH9CzLO9x+BmmEoje0KBKtTR5xZAVtnv4pEQzjUJzClNCvi5HlZkU3SJ dkJQW7SSwi4UhZr60aeiEG2Vrya0q2pR2cMM7GIFKsb/8P2yCWo+wIoIn/8VE0AT6Nfi IWP+3GgPua4Iz2OKlyXFQnbHPvfMEv77hDzOo8k8nt0Be6fXvzRaYlD9XR30x/wTLeuQ ILeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VAGQADKa; 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 k84-20020a628457000000b00668705a86ccsi8842277pfd.319.2023.06.28.10.59.01; Wed, 28 Jun 2023 10:59:14 -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=VAGQADKa; 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 S232017AbjF1R44 (ORCPT + 99 others); Wed, 28 Jun 2023 13:56:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232429AbjF1Rz7 (ORCPT ); Wed, 28 Jun 2023 13:55:59 -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 13207ED; Wed, 28 Jun 2023 10:55:59 -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 935F16141D; Wed, 28 Jun 2023 17:55:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ABBEC433C9; Wed, 28 Jun 2023 17:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974958; bh=7gxVFglFtXDu/AnNBVBeHPlv7TElOsSUgfmrlZBHPf0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VAGQADKajLlW1y4fkCGn3p1Dl/RgpYmd4NHIx7S2mGSb25bdu9R0GYH1edCFjDrWT tXuz1a1LhxR9StVgXR8q7G8ihL/kHAHNTNvO02H6CAtQ53yaCW8SQxL91q+IcPztHO x8k9ggymNK9nKqeSCuiHLU8YFCgb/bcppPK6nN0BDcvaxUzXBhxLzrU0buDQaaxdY9 P8nN1N9Z6XKDbOIYmGbz83ZnbMmWUFe74RzFn5BkhzaXhX5Kqe3n2fZ78BKFnP/5dh A2L1fOV2uIw7mb2Vyd7sBLkGNsY3X2Vw7VjYyvnMt6jxpNh8HI9rlL4fD0cP0LurMh bK1wlm/YrdjmA== Date: Wed, 28 Jun 2023 11:56:52 -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 07/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct user_sgmap64 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?1769970235272189468?= X-GMAIL-MSGID: =?utf-8?q?1769970235272189468?= Replace one-element array with flexible-array member in struct user_sgmap64. 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/aacraid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 87015dd2abd9..94eb83d38be6 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -522,7 +522,7 @@ struct sgmap64 { struct user_sgmap64 { u32 count; - struct user_sgentry64 sg[1]; + struct user_sgentry64 sg[]; }; struct sgmapraw { From patchwork Wed Jun 28 17:57:13 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: 113993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9122695vqr; Wed, 28 Jun 2023 11:22:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5e3M8U26DGUyjkfbwYSyBTGhaye/JvhnAhVTTr4+p6igTulFbJRIXGmphNMgiQWEvzi3lv X-Received: by 2002:a17:906:18:b0:992:c9d:fa6e with SMTP id 24-20020a170906001800b009920c9dfa6emr5019729eja.0.1687976529095; Wed, 28 Jun 2023 11:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687976529; cv=none; d=google.com; s=arc-20160816; b=YJT366rPOtV5XFxWfBp9g5C7vcVo2Z0g+E7Epoijd6UEl5wsTIDCA54i0iYVMGPgAU 6N+FeWWYwr6LDI+LEop/uJCwcBig2i2oJw8cuslyTNXhetQk+m+m8jtLrUFHLYtRwjLz eq7hC7kzmudb4OalH4Nn0sY8OeC4awwHQ05d6D+somDLW7FNPOMBZB+itYoD4Vwh9Yuc 1VfT5nH8YKb0gUBbtp4iWCEe6u9b9piOzJ9fzVaUCYLOwUVwHENIOQiSiy6klX6QGhXz vuqIHBeJ/1OC6XAB8kL1MXHgCgorNdPVAF+HIu0/uUnpPvbsRyIxuLHFt294k9NNtMqs M14g== 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=MnZChs9t6zbIUBUm6qDQ8nm7yR08D7ILvDfnKLW42eo=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=tzB5KwxaGOe0cICyXrt99FHmLr1nNVOuNg/8cTMQOcRcbD3EZks1zB2psVzB81E5sD DTc/a77pTtI7LHPKOuceMJu9VTne8XBT+XGnLl72SumD8yoahosnG5tkDzL8ywWq9TTy kLexhsJtSh5JRf0XdOtC0c7tZPufeQjNM7QOmsjn10/lKmA3dWZX8bqVb5UVQieKq0O1 LUGlbUZCTwg63N2a1MoEFeELSXJ7e1P+Sygf5o8giHfjCtBg6UY3wDzEsEYAVd2CzGcL fvgGYRXD+V7rQ+ONEju5gfwKv9QtrqabLE1df/I4GEHc8td8bS0iv39KZlMqnv2V3Hq9 TTDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kutrpgvc; 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 z11-20020a170906240b00b0098471b058a1si5878255eja.38.2023.06.28.11.21.44; Wed, 28 Jun 2023 11:22:09 -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=Kutrpgvc; 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 S232506AbjF1R5e (ORCPT + 99 others); Wed, 28 Jun 2023 13:57:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232441AbjF1R4V (ORCPT ); Wed, 28 Jun 2023 13:56:21 -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 5EFD426B7; Wed, 28 Jun 2023 10:56:20 -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 E9B2261426; Wed, 28 Jun 2023 17:56:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DB67C433C0; Wed, 28 Jun 2023 17:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687974979; bh=oURmBWezquiCxtgzQofhLG2vCq/AGJynRcxtSxdHtso=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Kutrpgvcj50b2E0D25+J+Q1Qzv+1OZq6w/2/qYqixf1eZbltUDqp0P0utmW2fLHgI 1g+flEQ6xrEepEkkuv+wr7qu3DYNxUpD1TBOlg8xFN1TZb8b9gHuzEOEnDAiWC7EHz wAEFETeWqMRdqTqpEk2Y9G5wQBGCfRgSIEoD7+W7xaabLbj71RF4b3RJTy60j0NEQ5 gIvMhuPy1/5A6cHNbArJlNCF1EqgXT4giwrXIPOdf+FpeRhS3FXsHd4ynapG7RkWqA SgUlCifBVQTU6L1IrEORnAO8ET/RNVlYdm18rgjICXK49Hg5rVk4ICxOvKlrqeSA1H 183vSoEdJzxIQ== Date: Wed, 28 Jun 2023 11:57:13 -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 08/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct sgmap Message-ID: <0c7402fe6448186cda5a2618a35eb5f8d1cbb313.1687974498.git.gustavoars@kernel.org> 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?1769971677136904840?= X-GMAIL-MSGID: =?utf-8?q?1769971677136904840?= Replace one-element array with flexible-array member in struct sgmap 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 --- drivers/scsi/aacraid/aachba.c | 24 ++++++++++-------------- drivers/scsi/aacraid/aacraid.h | 2 +- drivers/scsi/aacraid/commctrl.c | 4 ++-- drivers/scsi/aacraid/comminit.c | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 03ba974f6b2a..b2849e5cc104 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1336,8 +1336,7 @@ static int aac_read_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32 if (ret < 0) return ret; fibsize = sizeof(struct aac_read) + - ((le32_to_cpu(readcmd->sg.count) - 1) * - sizeof (struct sgentry)); + le32_to_cpu(readcmd->sg.count) * sizeof(struct sgentry); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); /* @@ -1471,8 +1470,7 @@ static int aac_write_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3 if (ret < 0) return ret; fibsize = sizeof(struct aac_write) + - ((le32_to_cpu(writecmd->sg.count) - 1) * - sizeof (struct sgentry)); + le32_to_cpu(writecmd->sg.count) * sizeof(struct sgentry); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); /* @@ -1590,9 +1588,9 @@ static int aac_scsi_64(struct fib * fib, struct scsi_cmnd * cmd) /* * Build Scatter/Gather list */ - fibsize = sizeof (struct aac_srb) - sizeof (struct sgentry) + - ((le32_to_cpu(srbcmd->sg.count) & 0xff) * - sizeof (struct sgentry64)); + fibsize = sizeof(struct aac_srb) + + (le32_to_cpu(srbcmd->sg.count) & 0xff) * + sizeof(struct sgentry64); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); @@ -1621,9 +1619,9 @@ static int aac_scsi_32(struct fib * fib, struct scsi_cmnd * cmd) /* * Build Scatter/Gather list */ - fibsize = sizeof (struct aac_srb) + - (((le32_to_cpu(srbcmd->sg.count) & 0xff) - 1) * - sizeof (struct sgentry)); + fibsize = sizeof(struct aac_srb) + + (le32_to_cpu(srbcmd->sg.count) & 0xff) * + sizeof(struct sgentry); BUG_ON (fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr))); @@ -1691,8 +1689,7 @@ static int aac_send_safw_bmic_cmd(struct aac_dev *dev, fibptr->hw_fib_va->header.XferState &= ~cpu_to_le32(FastResponseCapable); - fibsize = sizeof(struct aac_srb) - sizeof(struct sgentry) + - sizeof(struct sgentry64); + fibsize = sizeof(struct aac_srb) + sizeof(struct sgentry64); /* allocate DMA buffer for response */ addr = dma_map_single(&dev->pdev->dev, xfer_buf, xfer_len, @@ -2264,8 +2261,7 @@ int aac_get_adapter_info(struct aac_dev* dev) dev->a_ops.adapter_bounds = aac_bounds_32; dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size - sizeof(struct aac_fibhdr) - - sizeof(struct aac_write) + sizeof(struct sgentry)) / - sizeof(struct sgentry); + sizeof(struct aac_write)) / sizeof(struct sgentry); if (dev->dac_support) { dev->a_ops.adapter_read = aac_read_block64; dev->a_ops.adapter_write = aac_write_block64; diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 94eb83d38be6..3fbc22ae72b6 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -507,7 +507,7 @@ struct sge_ieee1212 { struct sgmap { __le32 count; - struct sgentry sg[1]; + struct sgentry sg[]; }; struct user_sgmap { diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index e7cc927ed952..df811ad4afaa 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c @@ -561,8 +561,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) rcode = -EINVAL; goto cleanup; } - actual_fibsize = sizeof(struct aac_srb) - sizeof(struct sgentry) + - ((user_srbcmd->sg.count & 0xff) * sizeof(struct sgentry)); + actual_fibsize = sizeof(struct aac_srb) + + (user_srbcmd->sg.count & 0xff) * sizeof(struct sgentry); actual_fibsize64 = actual_fibsize + (user_srbcmd->sg.count & 0xff) * (sizeof(struct sgentry64) - sizeof(struct sgentry)); /* User made a mistake - should not continue */ diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index bd99c5492b7d..d8dd89c87b01 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -523,8 +523,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) dev->max_fib_size = sizeof(struct hw_fib); dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size - sizeof(struct aac_fibhdr) - - sizeof(struct aac_write) + sizeof(struct sgentry)) - / sizeof(struct sgentry); + - sizeof(struct aac_write)) / sizeof(struct sgentry); dev->comm_interface = AAC_COMM_PRODUCER; dev->raw_io_interface = dev->raw_io_64 = 0; 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 { From patchwork Wed Jun 28 17:57:48 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: 113990 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9115797vqr; Wed, 28 Jun 2023 11:09:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/oVK2jZrk0k/mD278hqXQEyJlvSfIYQmrCu+iygqrKmvPZku9OtjvC3XV7ufhrmkPqzBJ X-Received: by 2002:a17:906:64cc:b0:987:115d:ba06 with SMTP id p12-20020a17090664cc00b00987115dba06mr27254883ejn.4.1687975792267; Wed, 28 Jun 2023 11:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687975792; cv=none; d=google.com; s=arc-20160816; b=OrorJJ46srV2PNBDo7hNQT4tuX0DIVsQLkmOfB7dndbdBhcn3u/ORYhlsL/1s55ALj kqxehF04iMe/pLHxOWRaTseX91tBQSnChYD90E8Kddml9XA915azeVgJSg0U5KonA3GP PVzpfkyRClY/qWq7QRJRvykBlWNvFkauYo0fMMe3zU1KMyumKGPxWjA/JKJQOFAasDjf qNWknjgoKd5i/dEx3HW/qcJrmfxTPHHk6n9uJ/bY5rzKLF67KsftwwEwpxLqw2qxJfBK Mpm6YTpG+azH4/eh8Fl6nSoTMHGKZnUgK7dmzOl155OSNCn8iogim5Wq45D2Zl9dIEVQ MnXg== 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=7Oz67mpCHURiHqsMSFLHPQzxTz2p/XFCgPcTpL0kuWk=; fh=2ET6nL/wlcZ4gumDTTusm6ilw662ytnheFDwMTsLDv4=; b=re/Mc4JXtwQPTVLoND46a9WWU22HHNPSZJfJUWOa4KW/k2yh9eBIykV3y34N0JYevg V4fdz/sDGTtXdU/2Qt2xfzaKXNjP8R8JhRYPgfT5gYjfq7HF4U60BZI/IZzCpaB8tj4n FPwt7udjE/mPjNHv6Lb9JwCxF0AKyFTbWaRTYlsKZ1PBn6qdb5Thv6sM7s2iiF9u3E0V ZcZa/OI4djsfHZXPqy1hQksxRHO2G3HRjrm9+pZfYdL2FQ+L7BpQcr6qYtMNoN30E+GJ W1mbXurNnc9WryLrEKXCduPLy+9PwKmPwP/Vrj/mnHBmI60XNsNUmDpKa9p4PcPjeA7C mhow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fB+3roWx; 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 mb18-20020a170906eb1200b00991df86ac0fsi3854679ejb.290.2023.06.28.11.09.13; Wed, 28 Jun 2023 11:09:52 -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=fB+3roWx; 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 S232125AbjF1R6R (ORCPT + 99 others); Wed, 28 Jun 2023 13:58:17 -0400 Received: from dfw.source.kernel.org ([139.178.84.217]:38110 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232016AbjF1R4z (ORCPT ); Wed, 28 Jun 2023 13:56:55 -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 8435F61425; Wed, 28 Jun 2023 17:56:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20271C433C0; Wed, 28 Jun 2023 17:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687975014; bh=td4cyQQksCxGhpEodkvmN0yoaLrNPgSUoTLfY9rGDgw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fB+3roWxpteaF0aMShsipBAj4bahjfCFQctyoGq3B5zVfMEaqDe1n2TIWQmB68bxh 48BVgJYR8oLZtdVm9fFLMMr95TUufrtPx/eLi4IEMv9AXbOnvJvD4KVPQWbVt2egTH 1DINJwCnOgM2gFFjZM/r5lJ1Cd4Gu8d+9gqYl1sPHBKSNR0y74nuNdMkq+S7DHkAWx 3le0rEcZPDCBQY/VD5LtH7yfMFOgW41OqkK5b2DHNEdy92QVcRV0j/sEuFiL3hGC8p UUcqI+BTPD6vtl7oZwqtj1HSBRPa9aVbPOWeGMokq/ZMyluYqtGbomLM/sMeLxBYlD HewzNxyoc1/xA== Date: Wed, 28 Jun 2023 11:57:48 -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 10/10][next] scsi: aacraid: Replace one-element array with flexible-array member in struct user_sgmap Message-ID: <2ebb702f25c4764fb36ab29f4f40728e12b0e42b.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?1769970904299236765?= X-GMAIL-MSGID: =?utf-8?q?1769970904299236765?= Replace one-element array with flexible-array member in struct user_sgmap and refactor the rest of the code, accordingly. Issue found with the help of Coccinelle and audited and fixed, manually. This results in no differences in binary output. 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/aacraid.h | 2 +- drivers/scsi/aacraid/commctrl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index fb3d93e4a99e..7d3f2f7348ff 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -512,7 +512,7 @@ struct sgmap { struct user_sgmap { u32 count; - struct user_sgentry sg[1]; + struct user_sgentry sg[]; }; struct sgmap64 { diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index df811ad4afaa..74eb33eb70d3 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c @@ -523,7 +523,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) goto cleanup; } - if ((fibsize < (sizeof(struct user_aac_srb) - sizeof(struct user_sgentry))) || + if ((fibsize < sizeof(struct user_aac_srb)) || (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))) { rcode = -EINVAL; goto cleanup;