From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795023289; b=QcaNRbp18v9J1H5UU3MJPdLKVL2vGlRIC45JdRU9DEtvQipClHzb/lzrT6OEqSrxL1Ta vRrwTvbHbHdzJWccVGe8b6aWp+a+XKrjpJtjjvp3kFCn+oA3HVjLyOXrvDCcd9H730ob6 qFb0QVfEeuARFLa9WN1rZIOgia+12TBwOWJTtfUaIYHSXrLhqwY7vfoQ+3yu2uqkhh1md IZb9IuaDL24vSR8DLCe4c+HNid6JbE09QYTn1YkgRCvsHtvbQVJFdPUSJe+tWwU+DRApR sdHr7+jXj2aluawjDJ3Hu2sEeVE1CkC3AFK7PPAzyv3OyEM6aoj8domCmDO/Yn0rLxA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023289; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=fboha2ZcMsDyw8AoNNhaCY9MuJ7fbwdmaUpcPR1pXSY=; b=YClE+09VOBiJ219H1ELPbsPAjPVLBoA7zg574pD3tb1JY7ukkcVOkWDhMoBS8LwtISXe 819X5LBKJcd80NuuWm44uhnOX8FM9BU5eQ3NX+EhDp1Ioc/B5RTDpR4D8ZnEYknOVHF2Z xczIiNlNoQ9NKjb+DVGAHEMvdyptBZf/QU9g9xwSvIuXCe377ckMwK8Fu5kPtrUJ+bQA6 HFJ7dpo6Ycxhd7Fo4rTVlxi2enhx0VcTWE8F3ipHZWO5xYR5Shgi2ltdlg1RBAfUB7nI/ q92ElxBGchLtKI8/4+QpUCCt5nV15HZCS3G7S63DGNIDYW0MJZFkQOjw9xyZ5uB+8pA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=145QHtNI; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C18D606A32A; Wed, 18 Nov 2026 17:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=145QHtNI Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5EAD1F000C4; Wed, 18 Nov 2026 17:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023289; bh=fboha2ZcMsDyw8AoNNhaCY9MuJ7fbwdmaUpcPR1pXSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=145QHtNI+1M4Co9dQBvwm0H0IWJPguMB0x8HM1WR7gvlpWdV3cJJEjH88G13tYHed 6SepXr7IknDk8XV+RVbDT0o9xpWzeGZiJx7LEqVigZCAAS/k8WDEtoQ+UjQrwblECm yf4VXQrr0k2mn/EWBsWPA6cJ0bJNl6pRV4EbkA50= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baochen Qiang , Nicolas Escande , Rameshkumar Sundaram , Jeff Johnson , Sasha Levin Subject: [PATCH 6.18 0316/2151] wifi: ath11k: fix locking problem in ath11k_dp_rx_tid_del_func() Date: Wed, 18 Nov 2026 15:34:11 +0100 Message-ID: <20261118150133.472537491@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicolas Escande [ Upstream commit c7555d47b1d051e0406474349deccf74b491ae01 ] In this function, we iterate over dp->reo_cmd_cache_flush_list using list_for_each_entry_safe(), under dp->reo_cmd_lock for concurrent access, and for each expired entries we : - drop the lock - call ath11k_dp_reo_cache_flush() - kfree() the entry - retake the lock to keep on iterating list_for_each_entry_safe() protects us from deleting the entry during iteration but doesn't protect for concurrent access. So another thread can take the lock and modify the list in between and crash like below. To fix the issue, move all entries that needs to be freed to a local list while under the lock and then iterate over the list to free the entries without holding the lock. BUG: Unable to handle kernel paging request at virtual address 00000010ddbeef8c Call trace: ath11k_dp_rx_tid_del_func+0x164/0x3c8 ath11k_dp_process_reo_status+0x1d4/0x2fc ath11k_dp_service_srng+0x334/0x338 ath11k_pcic_ext_grp_napi_poll+0x30/0xc0 __napi_poll+0x34/0x184 napi_threaded_poll+0xb4/0x1d8 kthread+0xdc/0xe0 ret_from_fork+0x10/0x20 Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.9.0.1-01977-QCAHKSWPL_SILICONZ-1 Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Suggested-by: Baochen Qiang Signed-off-by: Nicolas Escande Reviewed-by: Baochen Qiang Reviewed-by: Rameshkumar Sundaram Link: https://patch.msgid.link/20260813-ath11k-locking-v2-1-f4113a0bd0f4@gmail.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath11k/dp_rx.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 51e4170e7662b..939df41047290 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -762,6 +762,9 @@ static void ath11k_dp_rx_tid_del_func(struct ath11k_dp *dp, void *ctx, struct ath11k_base *ab = dp->ab; struct dp_rx_tid *rx_tid = ctx; struct dp_reo_cache_flush_elem *elem, *tmp; + struct list_head flush_list; + + INIT_LIST_HEAD(&flush_list); if (status == HAL_REO_CMD_DRAIN) { goto free_desc; @@ -783,23 +786,25 @@ static void ath11k_dp_rx_tid_del_func(struct ath11k_dp *dp, void *ctx, list_add_tail(&elem->list, &dp->reo_cmd_cache_flush_list); dp->reo_cmd_cache_flush_count++; - /* Flush and invalidate aged REO desc from HW cache */ + /* identify aged REO desc that needs removal */ list_for_each_entry_safe(elem, tmp, &dp->reo_cmd_cache_flush_list, list) { if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || time_after(jiffies, elem->ts + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { - list_del(&elem->list); + list_move_tail(&elem->list, &flush_list); dp->reo_cmd_cache_flush_count--; - spin_unlock_bh(&dp->reo_cmd_lock); - - ath11k_dp_reo_cache_flush(ab, &elem->data); - kfree(elem); - spin_lock_bh(&dp->reo_cmd_lock); } } spin_unlock_bh(&dp->reo_cmd_lock); + /* remove aged REO desc from HW */ + list_for_each_entry_safe(elem, tmp, &flush_list, list) { + ath11k_dp_reo_cache_flush(ab, &elem->data); + list_del(&elem->list); + kfree(elem); + } + return; free_desc: dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, -- 2.53.0