releases/5.0.1/net-sysfs-fix-mem-leak-in-netdev_register_kobject.patch

   1 From foo@baz Fri Mar  8 07:37:28 CET 2019
   2 From: YueHaibing <yuehaibing@huawei.com>
   3 Date: Sat, 2 Mar 2019 10:34:55 +0800
   4 Subject: net-sysfs: Fix mem leak in netdev_register_kobject
   5
   6 From: YueHaibing <yuehaibing@huawei.com>
   7
   8 [ Upstream commit 895a5e96dbd6386c8e78e5b78e067dcc67b7f0ab ]
   9
  10 syzkaller report this:
  11 BUG: memory leak
  12 unreferenced object 0xffff88837a71a500 (size 256):
  13   comm "syz-executor.2", pid 9770, jiffies 4297825125 (age 17.843s)
  14   hex dump (first 32 bytes):
  15     00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00  .....N..........
  16     ff ff ff ff ff ff ff ff 20 c0 ef 86 ff ff ff ff  ........ .......
  17   backtrace:
  18     [<00000000db12624b>] netdev_register_kobject+0x124/0x2e0 net/core/net-sysfs.c:1751
  19     [<00000000dc49a994>] register_netdevice+0xcc1/0x1270 net/core/dev.c:8516
  20     [<00000000e5f3fea0>] tun_set_iff drivers/net/tun.c:2649 [inline]
  21     [<00000000e5f3fea0>] __tun_chr_ioctl+0x2218/0x3d20 drivers/net/tun.c:2883
  22     [<000000001b8ac127>] vfs_ioctl fs/ioctl.c:46 [inline]
  23     [<000000001b8ac127>] do_vfs_ioctl+0x1a5/0x10e0 fs/ioctl.c:690
  24     [<0000000079b269f8>] ksys_ioctl+0x89/0xa0 fs/ioctl.c:705
  25     [<00000000de649beb>] __do_sys_ioctl fs/ioctl.c:712 [inline]
  26     [<00000000de649beb>] __se_sys_ioctl fs/ioctl.c:710 [inline]
  27     [<00000000de649beb>] __x64_sys_ioctl+0x74/0xb0 fs/ioctl.c:710
  28     [<000000007ebded1e>] do_syscall_64+0xc8/0x580 arch/x86/entry/common.c:290
  29     [<00000000db315d36>] entry_SYSCALL_64_after_hwframe+0x49/0xbe
  30     [<00000000115be9bb>] 0xffffffffffffffff
  31
  32 It should call kset_unregister to free 'dev->queues_kset'
  33 in error path of register_queue_kobjects, otherwise will cause a mem leak.
  34
  35 Reported-by: Hulk Robot <hulkci@huawei.com>
  36 Fixes: 1d24eb4815d1 ("xps: Transmit Packet Steering")
  37 Signed-off-by: YueHaibing <yuehaibing@huawei.com>
  38 Signed-off-by: David S. Miller <davem@davemloft.net>
  39 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  40 ---
  41  net/core/net-sysfs.c |    3 +++
  42  1 file changed, 3 insertions(+)
  43
  44 --- a/net/core/net-sysfs.c
  45 +++ b/net/core/net-sysfs.c
  46 @@ -1547,6 +1547,9 @@ static int register_queue_kobjects(struc
  47  error:
  48         netdev_queue_update_kobjects(dev, txq, 0);
  49         net_rx_queue_update_kobjects(dev, rxq, 0);
  50 +#ifdef CONFIG_SYSFS
  51 +       kset_unregister(dev->queues_kset);
  52 +#endif
  53         return error;
  54  }
  55