From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDE9DC54ED1 for ; Tue, 27 May 2025 05:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=b95ydlmvcuSBT0t2+Bg2nsz8TCc7xZGDZD7y4UeqVe8=; b=APgrAV5mkfM8Y4UNti1yQPooIr YLCNYVDbG5G4eM/ZJrLQglDEx20+nOP/Zi7ZonioZY2H+Hb6x5aHXWpUf5/nuUVoX2QggpXiqvsM8 GadNveFGm+lZF7tTibw8Pf4PiIehpoMJ9Yci+wncTXIBNOimH7wGi2/C9kMEztps35WcJN4IY/Hi7 bSy0js83OBufscmpoySA3Ei7YJfc2MlvMOqh7GNRfunVtx1hH7zm0ZutigyegjR1MTEHXyDUywxpH FFfYzo3DXuxnF2uRocl1OJWg/oH714YFXuyxR05igOqfMoCzGOwJbRoYrjb1RR493FqYI1qbpkwV1 mBvOBZWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJnK1-00000009ync-0NLH; Tue, 27 May 2025 05:57:57 +0000 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJnHr-00000009yN0-358S for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2025 05:55:45 +0000 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-ad545e74f60so388419366b.2 for ; Mon, 26 May 2025 22:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748325342; x=1748930142; darn=lists.infradead.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=b95ydlmvcuSBT0t2+Bg2nsz8TCc7xZGDZD7y4UeqVe8=; b=DdxmyDOcsHTxvs3i7PjQbI6TP/F8WUbqTM2SZh9Oe1Qv+TG2eMUdTJqPFIUbpx+ruQ 54pMoDtbCf5LpM8hMmV05pd3kgZRtHGOJ4FzPJuCR26PMJPmKCjFPxFzGT0X04qlYpMf N9iXpZG7pS5Kdle12Q45r84qpWTQfLziOtD9iPLqAGXQkC6KOyhM4+Jn+ohgaD9aKR2r JSf/m4jL7k9b3y02ijbmMo+mvTHjB24rHVYl8l+D56wDuLInM6KqMEZ4dotGt4sO8M6g o5Na/u2V8dl2DyKJER801tPUiVwf5znZ/88CPqplrMFNXLMffJ4CVPHu9b65VCuHh0q4 iMQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748325342; x=1748930142; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b95ydlmvcuSBT0t2+Bg2nsz8TCc7xZGDZD7y4UeqVe8=; b=K9tmYSoM+0weWkgC5q8Rf68BSNX8L5mMbI8B3z6YGr+luBlKEBzDbONkX/r06nzapj 64+EA+lYlB6EC1C4K1SysS+T0AVEL/sThGw+8RlvRuoKZ10BbzIvBIBlAxg3EKuZlOi2 Mr4CnC1fcy2N231grokE0mqbjOMSV7/l5v0FFV+miDU7Duuhqwznz9ym5CSrWw6hatqJ 4WEfKunkAfDN0DL6+FwUieg2/Jz6w5o+S1lVF7w7sTF6U7d+ST/EZAgkjXJRGueZyBev P3/3wRnDLXqnnGiBkmBCqfj3+K413SDJ9OspbMrvAJd4O3Hg4lihvNcV32ng1gq43TBb O73A== X-Forwarded-Encrypted: i=1; AJvYcCU29LzVwhbbXSGNVRNv+Bq/ugjM2dEBVGxMLD4ZwUCWbLZgNSoZrpZSVk2zCZKQmrZqBL2nMDsPHjI/JZAqSN94@lists.infradead.org X-Gm-Message-State: AOJu0Yx7/2TofVFOTcW9ZPRqdF/OxN7RxOMYmSOBgNhsrjZxHxiLEdM7 OIEr4be1tho8IqlxkOU0jgDZwTxOKAKlw1CurdX6VqLUyGDPFG22WkZOBfUX5vXh/2c= X-Gm-Gg: ASbGnct6ArzYhS3ZEsbJSsVs0oJMvKIOkukDmlSDJMujsnAcLhz/q7GfSwUOt97Te8s 8nWVGvdFu+/MgXS64dmEGMvHBrx43b330lPclNEmn8NxXSD+d7LiQVAWgNUXSGbtZ5y0xuul+2u nyOzJZIukU8mRZRiCcBTWaioGnWwagNCvj3PDeP7y8H3STRT4AwvVV7aieEiZD9Ky9Kxm7bbgEX BkTFdO1pPx0cgY/bacVggBZl39DQAONz6omyDDUbARFF6UaBe4nDzv2ekuxm01tuGr13VjX/OJL xlnMYrDxMZEln+Ps5+iFLOmDO2UPiqwgbrWUERdwBoknSmxkwUINTZg27jO7Z1QC/Y20TuR+NLQ = X-Google-Smtp-Source: AGHT+IHqcQBdt4pdotySeS2C++hBmaCY98bm7d0B72bKSBSdU4rDUN6+enuY0scFyUJE6OpWFCvJpg== X-Received: by 2002:a17:907:f818:b0:ad4:d32e:b571 with SMTP id a640c23a62f3a-ad85b1bf8d5mr961844066b.24.1748325342055; Mon, 26 May 2025 22:55:42 -0700 (PDT) Received: from localhost (hf94.n1.ips.mtn.co.ug. [41.210.143.148]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-ad52d06e098sm1818489666b.59.2025.05.26.22.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 22:55:41 -0700 (PDT) Date: Tue, 27 May 2025 08:55:38 +0300 From: Dan Carpenter To: Ming Yen Hsieh Cc: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Deren Wu , Allan Wang , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel-janitors@vger.kernel.org Subject: [PATCH next] wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan() Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Mailer: git-send-email haha only kidding X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250526_225543_774084_EA20DF8C X-CRM114-Status: GOOD ( 15.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ssid->ssids[] and sreq->ssids[] arrays have MT7925_RNR_SCAN_MAX_BSSIDS elements so this >= needs to be > to prevent an out of bounds access. Fixes: 8284815ca161 ("wifi: mt76: mt7925: add RNR scan support for 6GHz") Signed-off-by: Dan Carpenter --- Please review this one carefully. I'm less sure about the second chunk. Also maybe we should just delete this condition or check sreq->n_ssids instead? drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c index b8542be0d945..16f3cc58a192 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c @@ -2866,7 +2866,7 @@ int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, for (i = 0; i < sreq->n_ssids; i++) { if (!sreq->ssids[i].ssid_len) continue; - if (i > MT7925_RNR_SCAN_MAX_BSSIDS) + if (i >= MT7925_RNR_SCAN_MAX_BSSIDS) break; ssid->ssids[i].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len); @@ -2883,7 +2883,7 @@ int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, mt76_connac_mcu_build_rnr_scan_param(mdev, sreq); for (j = 0; j < mdev->rnr.bssid_num; j++) { - if (j > MT7925_RNR_SCAN_MAX_BSSIDS) + if (j >= MT7925_RNR_SCAN_MAX_BSSIDS) break; tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_BSSID, -- 2.47.2