qtnfmac: check band before allocating cmd_skb to avoid resource leak
authorColin Ian King <colin.king@canonical.com>
Fri, 2 Jun 2017 15:40:45 +0000 (16:40 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 13 Jun 2017 07:01:36 +0000 (10:01 +0300)
The current code allocates cmd_skb and then will leak this if band->band
is an illegal value. It is simpler to sanity check the band first before
allocating cmd_skb so that we don't have to free cmd_skb if an invalid
band occurs.

Detected by CoverityScan, CID#1437561 ("Resource Leak")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/quantenna/qtnfmac/commands.c

index f0a0cfa7d8a142a95263467d185476b1c3967046..cce62f39edafd07be5162230804b2f6d7eee375d 100644 (file)
@@ -1300,12 +1300,6 @@ int qtnf_cmd_get_mac_chan_info(struct qtnf_wmac *mac,
        int ret = 0;
        u8 qband;
 
-       cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac->macid, 0,
-                                           QLINK_CMD_CHANS_INFO_GET,
-                                           sizeof(*cmd));
-       if (!cmd_skb)
-               return -ENOMEM;
-
        switch (band->band) {
        case NL80211_BAND_2GHZ:
                qband = QLINK_BAND_2GHZ;
@@ -1320,6 +1314,12 @@ int qtnf_cmd_get_mac_chan_info(struct qtnf_wmac *mac,
                return -EINVAL;
        }
 
+       cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac->macid, 0,
+                                           QLINK_CMD_CHANS_INFO_GET,
+                                           sizeof(*cmd));
+       if (!cmd_skb)
+               return -ENOMEM;
+
        cmd = (struct qlink_cmd_chans_info_get *)cmd_skb->data;
        cmd->band = qband;
        ret = qtnf_cmd_send_with_reply(mac->bus, cmd_skb, &resp_skb, &res_code,