releases/5.0.6/genetlink-fix-a-memory-leak-on-error-path.patch

   1 From foo@baz Thu Mar 28 21:53:58 CET 2019
   2 From: YueHaibing <yuehaibing@huawei.com>
   3 Date: Thu, 21 Mar 2019 15:02:50 +0800
   4 Subject: genetlink: Fix a memory leak on error path
   5
   6 From: YueHaibing <yuehaibing@huawei.com>
   7
   8 [ Upstream commit ceabee6c59943bdd5e1da1a6a20dc7ee5f8113a2 ]
   9
  10 In genl_register_family(), when idr_alloc() fails,
  11 we forget to free the memory we possibly allocate for
  12 family->attrbuf.
  13
  14 Reported-by: Hulk Robot <hulkci@huawei.com>
  15 Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
  16 Signed-off-by: YueHaibing <yuehaibing@huawei.com>
  17 Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20 ---
  21  net/netlink/genetlink.c |    3 ++-
  22  1 file changed, 2 insertions(+), 1 deletion(-)
  23
  24 --- a/net/netlink/genetlink.c
  25 +++ b/net/netlink/genetlink.c
  26 @@ -366,7 +366,7 @@ int genl_register_family(struct genl_fam
  27                                start, end + 1, GFP_KERNEL);
  28         if (family->id < 0) {
  29                 err = family->id;
  30 -               goto errout_locked;
  31 +               goto errout_free;
  32         }
  33
  34         err = genl_validate_assign_mc_groups(family);
  35 @@ -385,6 +385,7 @@ int genl_register_family(struct genl_fam
  36
  37  errout_remove:
  38         idr_remove(&genl_fam_idr, family->id);
  39 +errout_free:
  40         kfree(family->attrbuf);
  41  errout_locked:
  42         genl_unlock_all();