Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp1976864pxm; Thu, 24 Feb 2022 13:25:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPaUAWVPJ6mYhVGXpEsVYjKs69DDeO2AsWiXv1U35pGePmQ1S4xKNCj2nwOyHeYQ44nLq4 X-Received: by 2002:a17:902:f20c:b0:14f:b0a4:726a with SMTP id m12-20020a170902f20c00b0014fb0a4726amr4557176plc.47.1645737923739; Thu, 24 Feb 2022 13:25:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645737923; cv=none; d=google.com; s=arc-20160816; b=b5oT41825O87L4GuYPWkwgatwB4kM5d0Q83qZ/kZnBtxXqFhd9PJ/amLtgKYYz6jCu 829MeQZMrritw0g5TsOjPi1S3fZPl1ek+v2rOHp8/zNUZZdJJmGFRc+rO6pgoj52JN0t GFK3kSb76/fai5xRgCEzBfDaaoFf/YOxsx76oaqfzszqmBllRyJedrCM1UGJDdZCM+z4 jZpSD4N/7bxl2ughNevaRen8pLM8S09tHz/PboSDX1GmplATbXwzGmap0UThxJyBf1Vm iNMYXVsZkSmxglK3e+7vRtDhWYeZ6eEGwDTqNqIZgeQyAQiwrCIkxI0+wniykMz6TAt5 XVwA== 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=Cu5JnEEYnbLqaUC6gHoijodAqwNoHTB9dDkKmDOqhpw=; b=kdEr5g2SNaTdQ29k2ltwKz2fnwbkC3gOgmPKFChs/FaE70ilSorGrYFGF+QwIz+fgC H7NxqMLw2XTgQcu9benFm8bOYadrJ+e/tolOBCvsAI/A1xng8V7VBx7Pg5My2rXPl7zM eUBRjE1+WD/CLQ0eWAN+YMsfQq+Sty+r2owjdeLHNqpWadIGNVnUsz3AFRvZSlMUwFzU kSBW/amQZeOWVCE8UMuWJ+j3C4jLTB9nQt5yLM9X4PVqCoZDxT/AufOJS3uGjb1uX3G5 HPiJPfdA/ISOqjMzG3f/IpiZt4ZwhZ/ITS7TYrxAfXDacPKx0G8Vqx8+vqrd0dIUTwYx IfHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B+BhV6pv; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q196-20020a632acd000000b00372c870a694si237956pgq.742.2022.02.24.13.25.08; Thu, 24 Feb 2022 13:25:23 -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=B+BhV6pv; 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 S234626AbiBXVKI (ORCPT + 99 others); Thu, 24 Feb 2022 16:10:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231749AbiBXVKG (ORCPT ); Thu, 24 Feb 2022 16:10:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CCDB18FAE0; Thu, 24 Feb 2022 13:09:36 -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 CEC6BB824F5; Thu, 24 Feb 2022 21:09:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1537C340E9; Thu, 24 Feb 2022 21:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645736973; bh=DcAufs9Hrmo8JESsKyMlW7GHd+f4ZhKBuP43hQIXIFU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=B+BhV6pvi/ih5l34RdQQ+65B4ws/9rDkE6x4Bpf5tr7381ZEopE+yMRmHwVn9N4XR n5VyVGyCIXX0sJCtXZI7QD5MUwbW3RwK/zBdyAn6iqRgNX9+CALlk2gZkninIIZfaO C4wYnsm7I4XZ7JvdtmD/yikkC9ioOxIX/UQQNtzdYDk07cJ876LOaFK3+32oM3a51g pTTxbXmaCVlJc8YBLRIrcQkWkIqp42tYTv9aowU1DTJ+UoqExz1GUscSwb8nyMl3fU RDDvspL0Lb94pvdqopi/+2k2Pj/12jnsO4dNSEeOzuCBupVKP7mcHDzSY9UjAr/1tQ P9/xgrzPyqrZg== Date: Thu, 24 Feb 2022 15:17:32 -0600 From: "Gustavo A. R. Silva" To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Johnson Cc: Kalle Valo , "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-hardening@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH v2 5/6][next] ath6kl: wmi: Replace one-element array with flexible-array member in struct wmi_disconnect_event Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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,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 Replace one-element array with flexible-array member in struct wmi_disconnect_event. This issue was found with the help of Coccinelle and audited and fixed, manually. Link: https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays Link: https://github.com/KSPP/linux/issues/79 Reviewed-by: Jeff Johnson Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - Revert changes in if-statement logic: if (len < sizeof(struct wmi_disconnect_event)) Link: https://lore.kernel.org/linux-hardening/03cee2a7-1455-b788-e1f0-5fb48db3478c@quicinc.com/ - Update changelog text. - Add Reviewed-by: Jeff Johnson tag. drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index 6b064e669d87..6a7fc07cd9aa 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -1596,7 +1596,7 @@ struct wmi_disconnect_event { u8 disconn_reason; u8 assoc_resp_len; - u8 assoc_info[1]; + u8 assoc_info[]; } __packed; /* -- 2.27.0