diff options
author | JP Abgrall <jpa@google.com> | 2014-04-24 15:50:33 -0700 |
---|---|---|
committer | Simon Shields <keepcalm444@gmail.com> | 2016-03-15 17:57:24 +1100 |
commit | 8132aca1c841f92e8a3f1398f724251e3d68d757 (patch) | |
tree | cd7d10937c1750db9d76efdb07ee6a82db6e12dd /net | |
parent | 74d8781c8987f23bb289d7b4eceb0c2bcf47686d (diff) | |
download | kernel_samsung_smdk4412-8132aca1c841f92e8a3f1398f724251e3d68d757.tar.gz kernel_samsung_smdk4412-8132aca1c841f92e8a3f1398f724251e3d68d757.tar.bz2 kernel_samsung_smdk4412-8132aca1c841f92e8a3f1398f724251e3d68d757.zip |
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.
Change-Id: I423dff6dda7ab91cdfdacb332330745739e1936d
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ping.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 140d420b3ec..93fbd727490 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); |