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;