From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 08:38:32 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v6.1.135~77 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c6b4197d592602dfdd1d720408f666b93d414eb;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index 493aeaa8af..c6d08fa074 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -152,3 +152,4 @@ x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch nvme-avoid-double-free-special-payload.patch powerpc-rtas-prevent-spectre-v1-gadget-construction-in-sys_rtas.patch phy-tegra-xusb-fix-return-value-of-tegra_xusb_find_port_node-function.patch +wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch diff --git a/queue-5.10/wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch b/queue-5.10/wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch new file mode 100644 index 0000000000..24aef9abe9 --- /dev/null +++ b/queue-5.10/wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch @@ -0,0 +1,100 @@ +From 95c38953cb1ecf40399a676a1f85dfe2b5780a9a Mon Sep 17 00:00:00 2001 +From: Kang Yang +Date: Tue, 8 Oct 2024 10:22:46 +0800 +Subject: wifi: ath10k: avoid NULL pointer error during sdio remove +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kang Yang + +commit 95c38953cb1ecf40399a676a1f85dfe2b5780a9a upstream. + +When running 'rmmod ath10k', ath10k_sdio_remove() will free sdio +workqueue by destroy_workqueue(). But if CONFIG_INIT_ON_FREE_DEFAULT_ON +is set to yes, kernel panic will happen: +Call trace: + destroy_workqueue+0x1c/0x258 + ath10k_sdio_remove+0x84/0x94 + sdio_bus_remove+0x50/0x16c + device_release_driver_internal+0x188/0x25c + device_driver_detach+0x20/0x2c + +This is because during 'rmmod ath10k', ath10k_sdio_remove() will call +ath10k_core_destroy() before destroy_workqueue(). wiphy_dev_release() +will finally be called in ath10k_core_destroy(). This function will free +struct cfg80211_registered_device *rdev and all its members, including +wiphy, dev and the pointer of sdio workqueue. Then the pointer of sdio +workqueue will be set to NULL due to CONFIG_INIT_ON_FREE_DEFAULT_ON. + +After device release, destroy_workqueue() will use NULL pointer then the +kernel panic happen. + +Call trace: +ath10k_sdio_remove + ->ath10k_core_unregister + …… + ->ath10k_core_stop + ->ath10k_hif_stop + ->ath10k_sdio_irq_disable + ->ath10k_hif_power_down + ->del_timer_sync(&ar_sdio->sleep_timer) + ->ath10k_core_destroy + ->ath10k_mac_destroy + ->ieee80211_free_hw + ->wiphy_free + …… + ->wiphy_dev_release + ->destroy_workqueue + +Need to call destroy_workqueue() before ath10k_core_destroy(), free +the work queue buffer first and then free pointer of work queue by +ath10k_core_destroy(). This order matches the error path order in +ath10k_sdio_probe(). + +No work will be queued on sdio workqueue between it is destroyed and +ath10k_core_destroy() is called. Based on the call_stack above, the +reason is: +Only ath10k_sdio_sleep_timer_handler(), ath10k_sdio_hif_tx_sg() and +ath10k_sdio_irq_disable() will queue work on sdio workqueue. +Sleep timer will be deleted before ath10k_core_destroy() in +ath10k_hif_power_down(). +ath10k_sdio_irq_disable() only be called in ath10k_hif_stop(). +ath10k_core_unregister() will call ath10k_hif_power_down() to stop hif +bus, so ath10k_sdio_hif_tx_sg() won't be called anymore. + +Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00189 + +Signed-off-by: Kang Yang +Tested-by: David Ruth +Reviewed-by: David Ruth +Link: https://patch.msgid.link/20241008022246.1010-1-quic_kangyang@quicinc.com +Signed-off-by: Jeff Johnson +Signed-off-by: Alva Lan +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath10k/sdio.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath10k/sdio.c ++++ b/drivers/net/wireless/ath/ath10k/sdio.c +@@ -3,6 +3,7 @@ + * Copyright (c) 2004-2011 Atheros Communications Inc. + * Copyright (c) 2011-2012,2017 Qualcomm Atheros, Inc. + * Copyright (c) 2016-2017 Erik Stromdahl ++ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + + #include +@@ -2649,9 +2650,9 @@ static void ath10k_sdio_remove(struct sd + + netif_napi_del(&ar->napi); + +- ath10k_core_destroy(ar); +- + destroy_workqueue(ar_sdio->workqueue); ++ ++ ath10k_core_destroy(ar); + } + + static const struct sdio_device_id ath10k_sdio_devices[] = {