queue-4.19/mt76-fix-a-leaked-reference-by-adding-a-missing-of_n.patch

   1 From 949d4942ec7ab3ff82a991b1cab3fd798ea8fa09 Mon Sep 17 00:00:00 2001
   2 From: Wen Yang <wen.yang99@zte.com.cn>
   3 Date: Fri, 22 Feb 2019 15:15:40 +0800
   4 Subject: mt76: fix a leaked reference by adding a missing of_node_put
   5
   6 [ Upstream commit 34e022d8b780a03902d82fb3997ba7c7b1f40c81 ]
   7
   8 The call to of_find_node_by_phandle returns a node pointer with refcount
   9 incremented thus it must be explicitly decremented after the last
  10 usage.
  11
  12 Detected by coccinelle with the following warnings:
  13 ./drivers/net/wireless/mediatek/mt76/eeprom.c:58:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
  14 ./drivers/net/wireless/mediatek/mt76/eeprom.c:61:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
  15 ./drivers/net/wireless/mediatek/mt76/eeprom.c:67:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
  16 ./drivers/net/wireless/mediatek/mt76/eeprom.c:70:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
  17 ./drivers/net/wireless/mediatek/mt76/eeprom.c:72:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
  18
  19 Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
  20 Cc: Felix Fietkau <nbd@nbd.name>
  21 Cc: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
  22 Cc: Kalle Valo <kvalo@codeaurora.org>
  23 Cc: "David S. Miller" <davem@davemloft.net>
  24 Cc: Matthias Brugger <matthias.bgg@gmail.com>
  25 Cc: linux-wireless@vger.kernel.org
  26 Cc: netdev@vger.kernel.org
  27 Cc: linux-arm-kernel@lists.infradead.org
  28 Cc: linux-mediatek@lists.infradead.org
  29 Cc: linux-kernel@vger.kernel.org
  30 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  31 Signed-off-by: Sasha Levin <sashal@kernel.org>
  32 ---
  33  drivers/net/wireless/mediatek/mt76/eeprom.c | 24 ++++++++++++++-------
  34  1 file changed, 16 insertions(+), 8 deletions(-)
  35
  36 diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
  37 index 530e5593765c..a1529920d877 100644
  38 --- a/drivers/net/wireless/mediatek/mt76/eeprom.c
  39 +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
  40 @@ -54,22 +54,30 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len)
  41                 part = np->name;
  42
  43         mtd = get_mtd_device_nm(part);
  44 -       if (IS_ERR(mtd))
  45 -               return PTR_ERR(mtd);
  46 +       if (IS_ERR(mtd)) {
  47 +               ret =  PTR_ERR(mtd);
  48 +               goto out_put_node;
  49 +       }
  50
  51 -       if (size <= sizeof(*list))
  52 -               return -EINVAL;
  53 +       if (size <= sizeof(*list)) {
  54 +               ret = -EINVAL;
  55 +               goto out_put_node;
  56 +       }
  57
  58         offset = be32_to_cpup(list);
  59         ret = mtd_read(mtd, offset, len, &retlen, dev->eeprom.data);
  60         put_mtd_device(mtd);
  61         if (ret)
  62 -               return ret;
  63 +               goto out_put_node;
  64
  65 -       if (retlen < len)
  66 -               return -EINVAL;
  67 +       if (retlen < len) {
  68 +               ret = -EINVAL;
  69 +               goto out_put_node;
  70 +       }
  71
  72 -       return 0;
  73 +out_put_node:
  74 +       of_node_put(np);
  75 +       return ret;
  76  #else
  77         return -ENOENT;
  78  #endif
  79 --
  80 2.19.1
  81