mac80211: rebase ontop of v4.18-rc7

[openwrt/staging/blogic.git] / package / kernel / mac80211 / patches / 380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch

diff --git a/package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch b/package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch
deleted file mode 100644 (file)
index 196a2bc..0000000
--- a/package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 260e629bbf441585860e21d5e10d2e88437f47c8 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Sun, 27 May 2018 22:17:02 +0100
-Subject: [PATCH] ath10k: fix memory leak of tpc_stats
-
-Currently tpc_stats is allocated and is leaked on the return
-path if num_tx_chain is greater than WMI_TPC_TX_N_CHAIN. Avoid
-this leak by performing the check on num_tx_chain before the
-allocation of tpc_stats.
-
-Detected by CoverityScan, CID#1469422 ("Resource Leak")
-Fixes: 4b190675ad06 ("ath10k: fix kernel panic while reading tpc_stats")
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/ath/ath10k/wmi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/net/wireless/ath/ath10k/wmi.c
-+++ b/drivers/net/wireless/ath/ath10k/wmi.c
-@@ -4557,10 +4557,6 @@ void ath10k_wmi_event_pdev_tpc_config(st
- 
-       ev = (struct wmi_pdev_tpc_config_event *)skb->data;
- 
--      tpc_stats = kzalloc(sizeof(*tpc_stats), GFP_ATOMIC);
--      if (!tpc_stats)
--              return;
--
-       num_tx_chain = __le32_to_cpu(ev->num_tx_chain);
- 
-       if (num_tx_chain > WMI_TPC_TX_N_CHAIN) {
-@@ -4569,6 +4565,10 @@ void ath10k_wmi_event_pdev_tpc_config(st
-               return;
-       }
- 
-+      tpc_stats = kzalloc(sizeof(*tpc_stats), GFP_ATOMIC);
-+      if (!tpc_stats)
-+              return;
-+
-       ath10k_wmi_tpc_config_get_rate_code(rate_code, pream_table,
-                                           num_tx_chain);
-