]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ath10k: fix memory leak of tpc_stats
authorColin Ian King <colin.king@canonical.com>
Sun, 27 May 2018 21:17:02 +0000 (22:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Oct 2018 23:59:16 +0000 (16:59 -0700)
[ Upstream commit 260e629bbf441585860e21d5e10d2e88437f47c8 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/ath/ath10k/wmi.c

index f97ab795cf2e6fe880c3797de07ac9df49e538fb..2319f79b34f056bbb120370d699377a81a48700e 100644 (file)
@@ -4602,10 +4602,6 @@ void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar, struct sk_buff *skb)
 
        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) {
@@ -4614,6 +4610,10 @@ void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar, struct sk_buff *skb)
                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);