From d813dde69e5938354776463c226a3883562b7d6f Mon Sep 17 00:00:00 2001 From: "Wang, Xiaoming" Date: Fri, 23 Jan 2015 13:28:41 -0600 Subject: [PATCH] net: ipv4: current group_info should be put after using. Plug a group_info refcount leak in ping_init. group_info is only needed during initialization and the code failed to release the reference on exit. While here move grabbing the reference to a place where it is actually needed. Signed-off-by: Chuansheng Liu Signed-off-by: Zhang Dongxing Signed-off-by: xiaoming wang Signed-off-by: David S. Miller (backported from commit b04c46190219a4f845e46a459e3102137b7f6cac) Conflicts: net/ipv4/ping.c CVE-2014-2851 BugLink: http://bugs.launchpad.net/bugs/1312994 Signed-off-by: Tyler Hicks Signed-off-by: Andy Whitcroft --- net/ipv4/ping.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index a8d7ed06234..cce74ad2a09 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -248,26 +248,33 @@ int ping_init_sock(struct sock *sk) struct net *net = sock_net(sk); gid_t group = current_egid(); gid_t range[2]; - struct group_info *group_info = get_current_groups(); - int i, j, count = group_info->ngroups; + struct group_info *group_info; + int i, j, count; + int ret = 0; inet_get_ping_group_range_net(net, range, range+1); if (range[0] <= group && group <= range[1]) return 0; + group_info = get_current_groups(); + count = group_info->ngroups; for (i = 0; i < group_info->nblocks; i++) { int cp_count = min_t(int, NGROUPS_PER_BLOCK, count); for (j = 0; j < cp_count; j++) { group = group_info->blocks[i][j]; if (range[0] <= group && group <= range[1]) - return 0; + goto out_release_group; } count -= cp_count; } - return -EACCES; + ret = -EACCES; + +out_release_group: + put_group_info(group_info); + return ret; } EXPORT_SYMBOL_GPL(ping_init_sock);