diff options
author | xiaoming wang <xiaoming.wang@intel.com> | 2014-04-14 06:30:16 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 16:57:30 +0100 |
commit | fbc520fe764d992c395807fad8522323f40cf6c0 (patch) | |
tree | fa11d25491df6a7091177e4e4e078456839ed539 /net/ipv4 | |
parent | c18a06524f3eda324a4ff33b7fdb761e8d1257de (diff) | |
download | kernel_samsung_smdk4412-fbc520fe764d992c395807fad8522323f40cf6c0.zip kernel_samsung_smdk4412-fbc520fe764d992c395807fad8522323f40cf6c0.tar.gz kernel_samsung_smdk4412-fbc520fe764d992c395807fad8522323f40cf6c0.tar.bz2 |
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 <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>
[steven@steven676.net: backport to 3.0: no kgid_t in 3.0]
Tested-by: Moritz Bandemer <replicant@posteo.mx>
Diffstat (limited to 'net/ipv4')
-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 46f8f3f..1fd3ed8 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -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) |