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 88E6037A498; Thu, 20 Aug 2026 17:52:32 +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=1787248353; cv=none; b=uZdvzivU2kTRj5Edn4vb2NuZPG8k8XN4F4c3tE+6KfXpzs8aob+yfvwjgMmKUsdKQ1jQgeBnoyaRcSvAg3fkdlQWGAq/DRqMKQms2b19EFZ+FwuBKLCZOaxGE3pQfEgVcvx8kOV+O/6q5LhqpxOJGSewUMElbnlAnGUq4ZoNxiE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248353; c=relaxed/simple; bh=VV2tZQnhknVD/O71QC1jEIw2lt4RZ8Z2/rRrgyS/6W0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lxciZo/clWbzcZOrX2uNjeWroqhbMgbHpRHNZBBo+Xh2191vpFF++XeMVjp0y1x+5M/JrvfDMUM/nhu3Bnc2k1ZgUZ41Ovoor7uj3gkTa+CTMBPe8Abaen+oI9W6IJ32CFq/4bHxgw8e7RdR+ocRqJJTnEIJp+XYsmQkCL6rhx4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CDsA7fXf; 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="CDsA7fXf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC47A1F000E9; Thu, 20 Aug 2026 17:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787248352; bh=vl2Gp7ZmANi7XItly4qzST8fRvtgNyio8ShjeKYzsns=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CDsA7fXfSc2Qxuk+gQNF99rWteIiQrdU++3xVcRhNB9+mLqZTl287cI1mNL7nArEH asGVDSMEvOwWME+cxjNbC+Cy/c67HK7t0MhtIC7cYHhEE85cTNPL1PjjIgSVGl4buy ti6/S+KQNghALE64YjHLTZNsQ1MyXeh2CcAd+wcw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Hodges , Vasanthakumar Thiagarajan , Jeff Johnson , Sasha Levin Subject: [PATCH 6.1 199/303] wifi: ath6kl: fix use-after-free in aggr_reset_state() Date: Thu, 20 Aug 2026 16:55:35 +0200 Message-ID: <20260820145259.366737790@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145253.200766705@linuxfoundation.org> References: <20260820145253.200766705@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Hodges [ Upstream commit ba7debb4dd6427386862220e8335a53a4bfc235d ] The aggr_reset_state() function uses timer_delete() (non-synchronous) for the aggregation timer before proceeding to delete TID state and before the structure is freed by callers like aggr_module_destroy(). If the timer callback (aggr_timeout) is executing when aggr_reset_state() is called, the callback will continue to access aggr_conn fields like rx_tid[] and stat[] which may be freed immediately after by kfree(aggr_info->aggr_conn) in aggr_module_destroy(). Additionally, the timer callback can re-arm itself via mod_timer() while aggr_reset_state() is running, creating a more complex race condition. Use timer_delete_sync() instead to ensure any running timer callback has completed before returning. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Cc: stable@vger.kernel.org Signed-off-by: Daniel Hodges Reviewed-by: Vasanthakumar Thiagarajan Link: https://patch.msgid.link/20260206185207.30098-1-git@danielhodges.dev Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -1829,7 +1829,7 @@ void aggr_reset_state(struct aggr_info_c return; if (aggr_conn->timer_scheduled) { - del_timer(&aggr_conn->timer); + timer_delete_sync(&aggr_conn->timer); aggr_conn->timer_scheduled = false; }