drop ath10k patch that was not needed

diff --git a/queue-4.19/series b/queue-4.19/series
index 3abae8410c804caadf51f22f4d124d4ed76b3805..e4422c8f56a2ccb6743486f9499a271f693e2b91 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -192,7 +192,6 @@ net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch
 wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch
 wifi-rt2x00-set-correct-tx_sw_cfg1-mac-register-for-.patch

diff --git a/queue-4.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-4.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index 59a80b5..0000000
--- a/queue-4.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9b5822acd6054252d01ab94a16ec80d3081dc469 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index 0a7551dc0f94..68728cba6df3 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -302,12 +302,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -641,8 +645,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 25778ebfdda0e75d3053fe6d2251de8e400f0da1..6c27fdafb1ecf3b147affe06357505c95599e061 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -368,7 +368,6 @@ wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 regulator-core-prevent-integer-underflow.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch
 wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch
 wifi-rt2x00-set-correct-tx_sw_cfg1-mac-register-for-.patch

diff --git a/queue-5.10/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-5.10/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index f16a98d..0000000
--- a/queue-5.10/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2d2a66729c0f2e378145a56f79d5270ca79e4fbb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index 28ec3c5b4d1f..1b34f12b7eca 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -297,12 +297,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -823,8 +827,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 99c993f254c6b477b3f8343e6fdef698cd148241..730b5f29209aca708a490ea4a4c17c4a6fc64e5e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -502,7 +502,6 @@ regulator-core-prevent-integer-underflow.patch
 wifi-mt76-mt7921-reset-msta-airtime_ac-while-clearin.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch
 wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch
 wifi-rt2x00-set-correct-tx_sw_cfg1-mac-register-for-.patch

diff --git a/queue-5.15/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-5.15/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index fc3fbc1..0000000
--- a/queue-5.15/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5cefbba74a78f4f4a636a4ca1096c1b3a4549592 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index adbaeb67eedf..9458540b7dde 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -297,12 +297,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -823,8 +827,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 36bf054272fb4b175af7e7879129df83b24330e0..daf0d3a04c4645b499e07f1933d200904588d5ab 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -674,7 +674,6 @@ wifi-rtw89-free-unused-skb-to-prevent-memory-leak.patch
 wifi-rtw89-fix-rx-filter-after-scan.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 bnxt_en-replace-reset-with-config-timestamps.patch
 selftests-bpf-free-the-allocated-resources-after-tes.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch

diff --git a/queue-5.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-5.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index 6353b94..0000000
--- a/queue-5.19/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2ba0df8d117035d1b05d2db337b39e9c07b24cdc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index fe34fcc00af0..55a520237263 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -301,12 +301,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -846,8 +850,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 555890a019cdc1b5ef01a2ae53f1c4049b949b58..a43b65109c335519c33766290fece3c1adea9930 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -208,7 +208,6 @@ net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch
 wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch
 wifi-rt2x00-set-correct-tx_sw_cfg1-mac-register-for-.patch

diff --git a/queue-5.4/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-5.4/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index 40f42ae..0000000
--- a/queue-5.4/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5d931348c7ad0a0465b1a1714152f675301bffe3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index 760d24a28f39..f6fdb18f0950 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -297,12 +297,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -823,8 +827,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index a2a241a6500d3f9e739163c6561a2a52c726ace6..d4b2ef35c345d99db5196b47730a63442e179e24 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -765,7 +765,6 @@ wifi-rtw89-fix-rx-filter-after-scan.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
 bluetooth-hci_event-make-sure-iso-events-don-t-affec.patch
-wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
 bnxt_en-replace-reset-with-config-timestamps.patch
 selftests-bpf-free-the-allocated-resources-after-tes.patch
 can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch

diff --git a/queue-6.0/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch b/queue-6.0/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
deleted file mode 100644 (file)
index 18a54b1..0000000
--- a/queue-6.0/wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3c40c49b26b3d3270cda809d326aa0b2a82eef63 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 18:23:54 +0300
-Subject: wifi: ath10k: reset pointer after memory free to avoid potential
- use-after-free
-
-From: Wen Gong <quic_wgong@quicinc.com>
-
-[ Upstream commit 1e1cb8e0b73e6f39a9d4a7a15d940b1265387eb5 ]
-
-When running suspend test, kernel crash happened in ath10k, and it is
-fixed by commit b72a4aff947b ("ath10k: skip ath10k_halt during suspend
-for driver state RESTARTING").
-
-Currently the crash is fixed, but as a common code style, it is better
-to set the pointer to NULL after memory is free.
-
-This is to address the code style and it will avoid potential bug of
-use-after-free.
-
-Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
-Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20220505092248.787-1-quic_wgong@quicinc.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index 8a075a711b71..f84f6c4c2a7a 100644
---- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-@@ -301,12 +301,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)
-                         ath10k_htt_get_vaddr_ring(htt),
-                         htt->rx_ring.base_paddr);
- 
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
-+
-       dma_free_coherent(htt->ar->dev,
-                         sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                         htt->rx_ring.alloc_idx.vaddr,
-                         htt->rx_ring.alloc_idx.paddr);
-+      htt->rx_ring.alloc_idx.vaddr = NULL;
- 
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- }
- 
- static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
-@@ -846,8 +850,10 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
-                         ath10k_htt_get_rx_ring_size(htt),
-                         vaddr_ring,
-                         htt->rx_ring.base_paddr);
-+      ath10k_htt_config_paddrs_ring(htt, NULL);
- err_dma_ring:
-       kfree(htt->rx_ring.netbufs_ring);
-+      htt->rx_ring.netbufs_ring = NULL;
- err_netbuf:
-       return -ENOMEM;
- }
--- 
-2.35.1
-