From nobody Fri Apr 3 20:53:42 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03543370D45; Mon, 23 Mar 2026 08:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774253338; cv=none; b=IZURIJuWgP8VI/XneAh3LbY0n2QsRhYQ4duPUMuDBcN6ORLl2S+M4XTEpVqrwQJdKsFlNwCjMlT4eW8vuWxXBukIrazq76oAC0xUA85bmX2tFEKY2ZuFjpjoicgt9ct3fy1hwy88+SQhNwnapIavY1mG4/GjlHCykdpbQoZCiu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774253338; c=relaxed/simple; bh=+YTarDJUwQe4e6etls5LScJVZBCBgqPTyPhafZJq7vE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=N5IQ9adxnQrfnBLXJcH5Qzx0RibU8PYY5T/U1MxT4K75o5rxYdpBvGuzW6pbG9aZk+uCfRIbv/d0hML0PfAbAZ3q77Ew1dNEQ6M3NEo80IYAA4kJgCqAwjsaQJiF6R5rZGD7r7wmoy6PmP/4slfccbgswQvO2yY4xD5/zKv/ttE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [111.196.245.197]) by APP-03 (Coremail) with SMTP id rQCowABng9oN9cBpOEeHCw--.33261S2; Mon, 23 Mar 2026 16:08:46 +0800 (CST) From: Pengpeng Hou To: Michael Nemanov , Johannes Berg , linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Kees Cook , Abdun Nihaal , Pengpeng Hou Subject: [PATCH v2] wifi: wl1251: validate packet IDs before indexing tx_frames Date: Mon, 23 Mar 2026 16:08:45 +0800 Message-ID: <20260323080845.40033-1-pengpeng@iscas.ac.cn> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowABng9oN9cBpOEeHCw--.33261S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Ary5Xr4fAFW7Zw1UWFWruFg_yoW8XryUpr 4rCa9FkF1kWFnIvr45JF40vFyrGan5JrW3WFWaka40vry3XFyFqw1agFyUur1jyFsaqayj qF4Yqry7Jr1qva7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkC14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU AVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14 v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkG c2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4U MIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjfUeL05UU UUU X-CM-SenderInfo: pshqw1xhqjqxpvfd2hldfou0/ Content-Type: text/plain; charset="utf-8" wl1251_tx_packet_cb() uses the firmware completion ID directly to index the fixed 16-entry wl->tx_frames[] array. The ID is a raw u8 from the completion block, and the callback does not currently verify that it fits the array before dereferencing it. Reject completion IDs that fall outside wl->tx_frames[] and keep the existing NULL check in the same guard. This keeps the fix local to the trust boundary and avoids touching the rest of the completion flow. Signed-off-by: Pengpeng Hou --- v2: - add commit message context and fix rationale - no code changes drivers/net/wireless/ti/wl1251/tx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ti/wl1251/tx.c b/drivers/net/wireless/ti/= wl1251/tx.c index 2da8c0d5105b..4489aa77bb0f 100644 --- a/drivers/net/wireless/ti/wl1251/tx.c +++ b/drivers/net/wireless/ti/wl1251/tx.c @@ -402,12 +402,14 @@ static void wl1251_tx_packet_cb(struct wl1251 *wl, int hdrlen; u8 *frame; =20 - skb =3D wl->tx_frames[result->id]; - if (skb =3D=3D NULL) { - wl1251_error("SKB for packet %d is NULL", result->id); + if (unlikely(result->id >=3D ARRAY_SIZE(wl->tx_frames) || + wl->tx_frames[result->id] =3D=3D NULL)) { + wl1251_error("invalid packet id %u", result->id); return; } =20 + skb =3D wl->tx_frames[result->id]; + info =3D IEEE80211_SKB_CB(skb); =20 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && --=20 2.50.1 (Apple Git-155)