summary refs log tree commit diff
path: root/net/netlink
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-03-21 15:02:50 +0800
committerDavid S. Miller <davem@davemloft.net>2019-03-21 09:29:06 -0700
commitceabee6c59943bdd5e1da1a6a20dc7ee5f8113a2 (patch)
treedf755938d4f14d9888d2de3c1e1e896d77a20634 /net/netlink
parent33872d79f5d1cbedaaab79669cc38f16097a9450 (diff)
downloadlinux-ceabee6c59943bdd5e1da1a6a20dc7ee5f8113a2.tar.gz
genetlink: Fix a memory leak on error path
In genl_register_family(), when idr_alloc() fails,
we forget to free the memory we possibly allocate for
family->attrbuf.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/genetlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 25eeb6d2a75a..f0ec068e1d02 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -366,7 +366,7 @@ int genl_register_family(struct genl_family *family)
 			       start, end + 1, GFP_KERNEL);
 	if (family->id < 0) {
 		err = family->id;
-		goto errout_locked;
+		goto errout_free;
 	}
 
 	err = genl_validate_assign_mc_groups(family);
@@ -385,6 +385,7 @@ int genl_register_family(struct genl_family *family)
 
 errout_remove:
 	idr_remove(&genl_fam_idr, family->id);
+errout_free:
 	kfree(family->attrbuf);
 errout_locked:
 	genl_unlock_all();