From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6451F3264F1; Mon, 20 Apr 2026 16:07:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701276; cv=none; b=DouDziHL79A8JLt+e4df6K2C6IVKFKqwJl3r+IDm7P2h/9yD3LJ0rgeHxmkxkE2Tp+2k6Nh2uu7tAD3ui1HHojMUbmNZeycTuxL7lfDk/bhWlJwKbM7sUsyjgnxtmEdoFFHJgmc2aFou7qXFY1Tajd7LYbAHTB2zu+CzeT5aq68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701276; c=relaxed/simple; bh=ByHHOYL/jmtr8ZmHiE8ClWUKFXzHsWHI4zPtmZZ3uwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qJrF01eIqNXUKYk4+vwChqfJdzby/8wqeFPDghMncxuekomgj/l4xYH8wxbq0kaK+X5sGrOdavXQ+p1xbmdFySPbbtoUktXPsAaONDKyoWeWwle+CHN4hKZmDpkfAYQcXztPbHx+PEFGQPmUD4XJH4ShoIzNCDEk67P+BmnqdiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WyhLodWI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WyhLodWI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEA0AC19425; Mon, 20 Apr 2026 16:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776701276; bh=ByHHOYL/jmtr8ZmHiE8ClWUKFXzHsWHI4zPtmZZ3uwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WyhLodWIdgtN7kS92fozGTJ/xGrnmm1DE6aP1GLKaqvGJC7SXAqj4B9Wc1jaRlLuH zDcRTMIlWHF5vl2Qi9Lp3OF+LHbpgMC54S70TQACtKwAKS0OvRkzmjG158s2vdXaeI HUmcwBUjF1ET9fhfkUYa16loeuHbx4bCB9hTg1R4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Johannes Berg , Sasha Levin Subject: [PATCH 6.12 018/162] wifi: wl1251: validate packet IDs before indexing tx_frames Date: Mon, 20 Apr 2026 17:40:50 +0200 Message-ID: <20260420153927.680412577@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153927.006696811@linuxfoundation.org> References: <20260420153927.006696811@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou [ Upstream commit 0fd56fad9c56356e7fa7a7c52e7ecbf807a44eb0 ] 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 Link: https://patch.msgid.link/20260323080845.40033-1-pengpeng@iscas.ac.cn Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- 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 adb4840b04893..c264d83e71d9c 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; - skb = wl->tx_frames[result->id]; - if (skb == NULL) { - wl1251_error("SKB for packet %d is NULL", result->id); + if (unlikely(result->id >= ARRAY_SIZE(wl->tx_frames) || + wl->tx_frames[result->id] == NULL)) { + wl1251_error("invalid packet id %u", result->id); return; } + skb = wl->tx_frames[result->id]; + info = IEEE80211_SKB_CB(skb); if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && -- 2.53.0