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 0B78C3321AA; Mon, 20 Apr 2026 15:57:10 +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=1776700630; cv=none; b=jqycBUCVB71DgGPtHaB/M4gJSFNPLqsnV1kXaqYLTo9bkLEJCP2juTzYgbj4JNTX5HKeLjW8EpBSeQK4LsOEmBJWLLZ6nlK22lzw9/WFoGn8ZbTO0/Z6hO4cc+s5phXKbecVDFVhU7voJxJvZGhid180ehFL3PSTMP8NGGWyC/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700630; c=relaxed/simple; bh=/ynAEnQ3O1KR65xAoK6oytau+gr0/U04ojZ2r8Go+WI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pUhUpuyjFUItLYRK+hi2VylxKa3GzuffjjsCcNUVYISi6DdZ/wnbntLLon9mCyPZCb7VInZIZ9zYbmAOuuhWeXZboYLsUVA3gtrUsh2oFQJnt+t48jQUfFwDzCTcfb0rciC9fHkuYUUprRvhaUNraNuGQWXDqAj0UxaRBGdgCKY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eMRfxWuR; 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="eMRfxWuR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94358C19425; Mon, 20 Apr 2026 15:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776700629; bh=/ynAEnQ3O1KR65xAoK6oytau+gr0/U04ojZ2r8Go+WI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eMRfxWuRa7F6JL1I+MmXUeE3qM/51auUNFoWaD3i8h6g0nbjFsPcB1r4FJf472o2F 4ViagBePdmdpSxwwtHgcfFGtLQTHhZ4MjzzFprM1iF+/6/TStLpcK71S0AjQDoG5Pv hEhG4SzR6CsfzWyagDQMstoFEdH8oA/TfLInk0bw= 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.18 026/198] wifi: wl1251: validate packet IDs before indexing tx_frames Date: Mon, 20 Apr 2026 17:40:05 +0200 Message-ID: <20260420153936.559146515@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153935.605963767@linuxfoundation.org> References: <20260420153935.605963767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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