From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D70FF4AD4AC for ; Mon, 5 Oct 2026 14:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791211115; cv=none; b=SPUZtorgC/iDXYBn2JDKOD95WjncHmbaOg5Se5tmBxm1xfNnh9JrIVP7+DIWAlD4U6iQIZXVnsFYAG/LGbo8k8fK7wk1iBecFOujUI08zxdjQ7m2Pknut2C5Y9Rw7EwBAkJoyYEmuLfxHOY5un5tPomprs/ilJvfuYjeBGX2bsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791211115; c=relaxed/simple; bh=edK3p496LUd3yQsC8UTO84JIuW+6kTq5k5Ev2wHuWJM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bWPGcRxScRwRoVb92GmTS6cF7iosUHQ+qo34egEdp5r0jCPDtl4OYfL57swvFIFZke/gj8iB8TwU2VRoQJ/SeTDRTt3U+4gB+hV29tPCVg5q+X1Wb06/CX9q6lJwy1g+dOTEL48/ZhHdqWy70y+Vn9s/4YYYFWcjEKsnRNw/ysE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lAftniTV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lAftniTV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 206E41F000FF; Mon, 5 Oct 2026 14:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791211106; bh=26YSQR7Rh46WSPwQw0KYFZS0v55S/FaQhcMdlrZEz5s=; h=Subject:To:Cc:From:Date; b=lAftniTVALrwlOaruYsl4+xEusgKoR47/ib+t4AptR6ZuePJJY04TR/W9kOT9ZIfN Qb6yc51zOsj0rO3E9dq9ESZpM0FfVUDM6xneUSboilb85iquucQ/nQwTlPbao2Yr03 VHcUAVN9QVSjw3W9F+3jqRHpS8t1iaasvIV5DCiI= Subject: FAILED: patch "[PATCH] wifi: mac80211: shut down RX BA session timer on teardown" failed to apply to 5.10-stable tree To: enderaoelyther@gmail.com,johannes.berg@intel.com Cc: From: Date: Mon, 05 Oct 2026 16:38:06 +0200 Message-ID: <2026100506-monastery-snide-0e30@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x e588e83e5c7a0f6d7a77dbbb58927c8c8cfd598e # git commit -s git send-email --to '' --in-reply-to '2026100506-monastery-snide-0e30@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e588e83e5c7a0f6d7a77dbbb58927c8c8cfd598e Mon Sep 17 00:00:00 2001 From: Zhao Li Date: Thu, 10 Sep 2026 14:54:02 +0800 Subject: [PATCH] wifi: mac80211: shut down RX BA session timer on teardown Tearing down an RX BA session can leave the session timer queued on a freed tid_rx. Later timer-wheel processing and the timer callback itself then run against freed memory. An RX BAR handler can dereference tid_rx under RCU before teardown unpublishes it and stay in its read-side critical section while teardown deletes the session timer. The stale handler can then rearm the timer after timer_delete_sync() returns and before the RCU callback frees tid_rx. Use timer_shutdown_sync() so rearm attempts become ineffective once teardown starts. Keep reorder_timer unchanged: teardown marks the session removed under reorder_lock and its release path checks that state before rearming. session_timer has no equivalent guard because ieee80211_rx_h_ctrl() rearms it before taking reorder_lock. Fixes: a87f736d942c ("mac80211: use RCU for RX aggregation") Cc: stable@kernel.org # 5.15+ Assisted-by: LLM sparse kasan Signed-off-by: Zhao Li Signed-off-by: Johannes Berg diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 9629e00069a1..01d6703767c6 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -102,7 +102,7 @@ void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, if (!tid_rx) return; - timer_delete_sync(&tid_rx->session_timer); + timer_shutdown_sync(&tid_rx->session_timer); /* make sure ieee80211_sta_reorder_release() doesn't re-arm the timer */ spin_lock_bh(&tid_rx->reorder_lock);