Skip to content

Commit

Permalink
genetlink: fix a memory leak on error path
Browse files Browse the repository at this point in the history
In __genl_register_family(), when genl_validate_assign_mc_groups()
fails, we forget to free the memory we possibly allocate for
family->attrbuf.

Note, some callers call genl_unregister_family() to clean up
on error path, it doesn't work because the family is inserted
to the global list in the nearly last step.

Cc: Jakub Kicinski <kubakici@wp.pl>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
WANG Cong authored and David S. Miller committed Nov 3, 2016
1 parent 990ff4d commit 00ffc1b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/netlink/genetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ int __genl_register_family(struct genl_family *family)

err = genl_validate_assign_mc_groups(family);
if (err)
goto errout_locked;
goto errout_free;

list_add_tail(&family->family_list, genl_family_chain(family->id));
genl_unlock_all();
Expand All @@ -417,6 +417,8 @@ int __genl_register_family(struct genl_family *family)

return 0;

errout_free:
kfree(family->attrbuf);
errout_locked:
genl_unlock_all();
errout:
Expand Down

0 comments on commit 00ffc1b

Please sign in to comment.