diff options
author | John Crispin <john@phrozen.org> | 2018-08-02 08:44:29 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-09-26 16:35:33 +0200 |
commit | d9eefa7a7031543571d434693c7f984dfbdc990d (patch) | |
tree | 73ac027ccf6cdb6fd209a83e7e25c3d0472d46b4 /package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch | |
parent | e9d92bf1e1af71ff19e4cdc753de3f65963c58a5 (diff) | |
download | upstream-d9eefa7a7031543571d434693c7f984dfbdc990d.tar.gz upstream-d9eefa7a7031543571d434693c7f984dfbdc990d.tar.bz2 upstream-d9eefa7a7031543571d434693c7f984dfbdc990d.zip |
mac80211: rebase ontop of v4.18.5
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch')
-rw-r--r-- | package/kernel/mac80211/patches/380-0009-ath10k-fix-memory-leak-of-tpc_stats.patch | 43 |
1 files changed, 0 insertions, 43 deletions
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 index 196a2bc862..0000000000 --- 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); - |