OSDN Git Service

ath10k: fix potential memory leak in ath10k_wmi_tlv_op_pull_fw_stats()
authorChristian Lamparter <chunkeey@googlemail.com>
Thu, 29 Dec 2016 14:12:09 +0000 (16:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:37:26 +0000 (08:37 +0000)
[ Upstream commit 097e46d2ae90265d1afe141ba6208ba598b79e01 ]

ath10k_wmi_tlv_op_pull_fw_stats() uses tb = ath10k_wmi_tlv_parse_alloc(...)
function, which allocates memory. If any of the three error-paths are
taken, this tb needs to be freed.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/ath/ath10k/wmi-tlv.c

index 6fbd17b..02eea3c 100644 (file)
@@ -1105,8 +1105,10 @@ static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
                struct ath10k_fw_stats_pdev *dst;
 
                src = data;
-               if (data_len < sizeof(*src))
+               if (data_len < sizeof(*src)) {
+                       kfree(tb);
                        return -EPROTO;
+               }
 
                data += sizeof(*src);
                data_len -= sizeof(*src);
@@ -1126,8 +1128,10 @@ static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
                struct ath10k_fw_stats_vdev *dst;
 
                src = data;
-               if (data_len < sizeof(*src))
+               if (data_len < sizeof(*src)) {
+                       kfree(tb);
                        return -EPROTO;
+               }
 
                data += sizeof(*src);
                data_len -= sizeof(*src);
@@ -1145,8 +1149,10 @@ static int ath10k_wmi_tlv_op_pull_fw_stats(struct ath10k *ar,
                struct ath10k_fw_stats_peer *dst;
 
                src = data;
-               if (data_len < sizeof(*src))
+               if (data_len < sizeof(*src)) {
+                       kfree(tb);
                        return -EPROTO;
+               }
 
                data += sizeof(*src);
                data_len -= sizeof(*src);