Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp1999461pxm; Thu, 24 Feb 2022 14:00:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkLVHR6YjCNswOGzJcnXzPKlvkVWwjQ5dai1nUcZ2BeqjsSVXV34Bk5kxTkWDXwCm57iNa X-Received: by 2002:a05:6402:2074:b0:410:81bf:ff3b with SMTP id bd20-20020a056402207400b0041081bfff3bmr4360770edb.326.1645740000627; Thu, 24 Feb 2022 14:00:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645740000; cv=none; d=google.com; s=arc-20160816; b=Vnz2z+VRxPuMGQWjUE0UmxlFgUbP3sqpBkQp3OXbG5wLuaPOQQdf/4pbtA8ZijCzpL 7aN4U0pF8S8Zr7i0FTvPAliZvzG+yh5cA5g/A+HdACs7ke/RVTvKN+yLsa85V63gl/of 8WbNJFEwB703lnAYZRwhK9yNvADqgalZv2o5H2YYd6CeAHh4uSmVDl+3eiEyxaWGPaWE oqwxR7S5DJ11zkdPxNFuhEmX3cbaBOeHzmI4vmddGKO9tMI3nbaWxNP1X2Gp8q6Qlffc ti5LB8U4InuKKuaaqsmaIPKQuBc5GT1jaGYo9zokyoVAGI04X+NFVJX61n34ykpXk35C fsQw== 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=qlv8rZYRsZ0DnOGr+nnkiWe2sPf3aBOTTI2I5t+UAyU=; b=kdNnUQIiHyEdRhz6s3XHQqtzlT9nSYKAXvP8kYCYiU6dSqvPrk3ofubpsYlQJf6KZs rGgQ0ngzvUQZnpIIkzmgG1wiB9AhHuyTG9G22K/v7di4COUD6lNPMoQCgLMx3DK8K5Tw yeKrWI9/fAxb2783J54N/FFamE3nuDQrx+7IlDUGGhWqE01mmWqpSmQIAVbOMlXi6X0u JjRdMymotCoZIySc/HoklrcduYv3tvmSzlQ564S8hdYSE30QUPnlsJ3DQDiTOq/C44vm qGkxU1AuYEh5Y0IsB6JVWTZq8h3AbTDdm583ksqAiDslYIeJDoL9S2em2Fe+g4MOB0mA g08A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Spsygd9H; 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 a21-20020a1709065f9500b006b3c3c7edcesi246962eju.948.2022.02.24.13.59.36; Thu, 24 Feb 2022 14:00:00 -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=Spsygd9H; 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 S234597AbiBXVJY (ORCPT + 99 others); Thu, 24 Feb 2022 16:09:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234601AbiBXVJV (ORCPT ); Thu, 24 Feb 2022 16:09:21 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 980B61DED49; Thu, 24 Feb 2022 13:08:50 -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 41CD5B829B8; Thu, 24 Feb 2022 21:08:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 226CCC340E9; Thu, 24 Feb 2022 21:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645736928; bh=Vl3ib7xbq47C3BnaPMshuk8tRt16r+WBcMwB0/gWLIo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Spsygd9HrvSsJS2wTixxcoZi9fmFnKZ/oQiYY8LJerITprwMV9xeRUNm6WhzcjH1o PaubA55gEG1Q55UDo6dJganqmVjzy4Bmfl7N9rPtxylEeyKzF61CBu6kzzcVRTlYiB pcOhdONjo4a+kXHJRlnzHmINHirTg+FQx2czebFOAfTKWV1nRUbQKhgFM18LzYe2Hj FbvjHrPf2zJ495rHKUlWzap1VXVrRDwZmXwlnw/vRbTx5YaDFlawET6GPxRW8K0/8m qYUyuS2x0QIZbQ25OjOlAMoaMA8idCyqOSq20CMytZEu+akI2xWgmJAkuhgy3BKwwY nhf28eCpvZA2A== Date: Thu, 24 Feb 2022 15:16:46 -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 3/6][next] ath6kl: wmi: Replace one-element array with flexible-array member in struct wmi_channel_list_reply 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_channel_list_reply. 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_channel_list_reply)) Link: https://lore.kernel.org/linux-hardening/3abb0846-a26f-3d76-8936-cd23cf4387f1@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 9e168752bec2..432e4f428a4a 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -1373,7 +1373,7 @@ struct wmi_channel_list_reply { u8 num_ch; /* channel in Mhz */ - __le16 ch_list[1]; + __le16 ch_list[]; } __packed; /* List of Events (target to host) */ -- 2.27.0