Skip to content

Commit

Permalink
net: ipv4: current group_info should be put after using.
Browse files Browse the repository at this point in the history
[ Upstream commit b04c461 ]

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 <chuansheng.liu@intel.com>
Signed-off-by: Zhang Dongxing <dongxing.zhang@intel.com>
Signed-off-by: xiaoming wang <xiaoming.wang@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
wangxiaoming321 authored and gregkh committed Jun 7, 2014
1 parent 6392b26 commit 67c6fc9
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions net/ipv4/ping.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,26 +203,33 @@ static 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;
}

static void ping_close(struct sock *sk, long timeout)
Expand Down

0 comments on commit 67c6fc9

Please sign in to comment.