* [PATCH 0/2] wifi: ath11k: fix event locking @ 2023-10-19 10:42 Johan Hovold 2023-10-19 10:42 ` [PATCH 1/2] wifi: ath11k: fix temperature " Johan Hovold 2023-10-19 10:42 ` [PATCH 2/2] wifi: ath11k: fix dfs radar " Johan Hovold 0 siblings, 2 replies; 7+ messages in thread From: Johan Hovold @ 2023-10-19 10:42 UTC (permalink / raw) To: Kalle Valo Cc: Jeff Johnson, Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, Johan Hovold RCU lockdep reported suspicious RCU usage when accessing the temperature sensor. Inspection revealed that the DFS radar event code was also missing the required RCU read-side critical section marking. Johan Johan Hovold (2): wifi: ath11k: fix temperature event locking wifi: ath11k: fix dfs radar event locking drivers/net/wireless/ath/ath11k/wmi.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.41.0 -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] wifi: ath11k: fix temperature event locking 2023-10-19 10:42 [PATCH 0/2] wifi: ath11k: fix event locking Johan Hovold @ 2023-10-19 10:42 ` Johan Hovold 2023-10-19 15:04 ` Jeff Johnson 2023-10-19 10:42 ` [PATCH 2/2] wifi: ath11k: fix dfs radar " Johan Hovold 1 sibling, 1 reply; 7+ messages in thread From: Johan Hovold @ 2023-10-19 10:42 UTC (permalink / raw) To: Kalle Valo Cc: Jeff Johnson, Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, Johan Hovold, stable The ath11k active pdevs are protected by RCU but the temperature event handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section as reported by RCU lockdep: ============================= WARNING: suspicious RCU usage 6.6.0-rc6 #7 Not tainted ----------------------------- drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 no locks held by swapper/0/0. ... Call trace: ... lockdep_rcu_suspicious+0x16c/0x22c ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] Mark the code in question as an RCU read-side critical section to avoid any potential use-after-free issues. Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") Cc: stable@vger.kernel.org # 5.7 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/net/wireless/ath/ath11k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 23ad6825e5be..980ff588325d 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8383,6 +8383,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n", ev->temp, ev->pdev_id); + rcu_read_lock(); + ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); if (!ar) { ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); @@ -8392,6 +8394,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, ath11k_thermal_event_temperature(ar, ev->temp); + rcu_read_unlock(); + kfree(tb); } -- 2.41.0 -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wifi: ath11k: fix temperature event locking 2023-10-19 10:42 ` [PATCH 1/2] wifi: ath11k: fix temperature " Johan Hovold @ 2023-10-19 15:04 ` Jeff Johnson 2023-10-19 15:07 ` Jeff Johnson 2023-10-19 15:17 ` Johan Hovold 0 siblings, 2 replies; 7+ messages in thread From: Jeff Johnson @ 2023-10-19 15:04 UTC (permalink / raw) To: Johan Hovold, Kalle Valo Cc: Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, stable On 10/19/2023 3:42 AM, Johan Hovold wrote: > The ath11k active pdevs are protected by RCU but the temperature event > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > read-side critical section as reported by RCU lockdep: How do I enable this? Just enable CONFIG_PROVE_RCU? Of course I'd also need to exercise the code path... > > ============================= > WARNING: suspicious RCU usage > 6.6.0-rc6 #7 Not tainted > ----------------------------- > drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! > > other info that might help us debug this: > > rcu_scheduler_active = 2, debug_locks = 1 > no locks held by swapper/0/0. > ... > Call trace: > ... > lockdep_rcu_suspicious+0x16c/0x22c > ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] > ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] > ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] > > Mark the code in question as an RCU read-side critical section to avoid > any potential use-after-free issues. > > Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") > Cc: stable@vger.kernel.org # 5.7 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/net/wireless/ath/ath11k/wmi.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c > index 23ad6825e5be..980ff588325d 100644 > --- a/drivers/net/wireless/ath/ath11k/wmi.c > +++ b/drivers/net/wireless/ath/ath11k/wmi.c > @@ -8383,6 +8383,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, > ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n", > ev->temp, ev->pdev_id); > > + rcu_read_lock(); > + > ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); > if (!ar) { > ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); aren't you missing an unlock() in this error path? perhaps have a goto cleanup that does both the unlock() and the kfree()? > @@ -8392,6 +8394,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, > > ath11k_thermal_event_temperature(ar, ev->temp); > > + rcu_read_unlock(); > + > kfree(tb); > } > -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wifi: ath11k: fix temperature event locking 2023-10-19 15:04 ` Jeff Johnson @ 2023-10-19 15:07 ` Jeff Johnson 2023-10-19 15:17 ` Johan Hovold 1 sibling, 0 replies; 7+ messages in thread From: Jeff Johnson @ 2023-10-19 15:07 UTC (permalink / raw) To: Johan Hovold, Kalle Valo Cc: Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, stable On 10/19/2023 8:04 AM, Jeff Johnson wrote: > perhaps have a goto cleanup that does both the unlock() and the kfree()? or goto exit to be consistent with others, including the DFS radar event -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wifi: ath11k: fix temperature event locking 2023-10-19 15:04 ` Jeff Johnson 2023-10-19 15:07 ` Jeff Johnson @ 2023-10-19 15:17 ` Johan Hovold 1 sibling, 0 replies; 7+ messages in thread From: Johan Hovold @ 2023-10-19 15:17 UTC (permalink / raw) To: Jeff Johnson Cc: Johan Hovold, Kalle Valo, Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, stable On Thu, Oct 19, 2023 at 08:04:55AM -0700, Jeff Johnson wrote: > On 10/19/2023 3:42 AM, Johan Hovold wrote: > > The ath11k active pdevs are protected by RCU but the temperature event > > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > > read-side critical section as reported by RCU lockdep: > > How do I enable this? Just enable CONFIG_PROVE_RCU? Yeah, via CONFIG_PROVE_LOCKING. > Of course I'd also need to exercise the code path... Right, this one I hit when reading out the sensor temperature (e.g. using lm_sensors). > > + rcu_read_lock(); > > + > > ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); > > if (!ar) { > > ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); > > aren't you missing an unlock() in this error path? > > perhaps have a goto cleanup that does both the unlock() and the kfree()? Bah, I am, thanks for catching that. Spent too much time on scanning for further instances that I didn't check the first one properly. Sorry about that. Will send a v2. Johan -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] wifi: ath11k: fix dfs radar event locking 2023-10-19 10:42 [PATCH 0/2] wifi: ath11k: fix event locking Johan Hovold 2023-10-19 10:42 ` [PATCH 1/2] wifi: ath11k: fix temperature " Johan Hovold @ 2023-10-19 10:42 ` Johan Hovold 2023-10-19 15:08 ` Jeff Johnson 1 sibling, 1 reply; 7+ messages in thread From: Johan Hovold @ 2023-10-19 10:42 UTC (permalink / raw) To: Kalle Valo Cc: Jeff Johnson, Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, Johan Hovold, stable The ath11k active pdevs are protected by RCU but the DFS radar event handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section. Mark the code in question as an RCU read-side critical section to avoid any potential use-after-free issues. Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Cc: stable@vger.kernel.org # 5.6 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/net/wireless/ath/ath11k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 980ff588325d..fe6b70a503d0 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8337,6 +8337,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff ev->detector_id, ev->segment_id, ev->timestamp, ev->is_chirp, ev->freq_offset, ev->sidx); + rcu_read_lock(); + ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); if (!ar) { @@ -8354,6 +8356,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff ieee80211_radar_detected(ar->hw); exit: + rcu_read_unlock(); + kfree(tb); } -- 2.41.0 -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] wifi: ath11k: fix dfs radar event locking 2023-10-19 10:42 ` [PATCH 2/2] wifi: ath11k: fix dfs radar " Johan Hovold @ 2023-10-19 15:08 ` Jeff Johnson 0 siblings, 0 replies; 7+ messages in thread From: Jeff Johnson @ 2023-10-19 15:08 UTC (permalink / raw) To: Johan Hovold, Kalle Valo Cc: Pradeep Kumar Chitrapu, ath11k, linux-wireless, linux-kernel, stable On 10/19/2023 3:42 AM, Johan Hovold wrote: > The ath11k active pdevs are protected by RCU but the DFS radar event > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > read-side critical section. > > Mark the code in question as an RCU read-side critical section to avoid > any potential use-after-free issues. > > Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") > Cc: stable@vger.kernel.org # 5.6 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-19 15:17 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-10-19 10:42 [PATCH 0/2] wifi: ath11k: fix event locking Johan Hovold 2023-10-19 10:42 ` [PATCH 1/2] wifi: ath11k: fix temperature " Johan Hovold 2023-10-19 15:04 ` Jeff Johnson 2023-10-19 15:07 ` Jeff Johnson 2023-10-19 15:17 ` Johan Hovold 2023-10-19 10:42 ` [PATCH 2/2] wifi: ath11k: fix dfs radar " Johan Hovold 2023-10-19 15:08 ` Jeff Johnson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox