diff options
author | JP Abgrall <jpa@google.com> | 2014-04-24 15:50:33 -0700 |
---|---|---|
committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 15:56:41 +0100 |
commit | 7e16c3a0a0ddbd5162b91e14a5e68587c9ecd142 (patch) | |
tree | de43aadbccd7328218071eab8d0a3a385569dab1 /net | |
parent | f2332ccd716b6af94f23819cb84cc6e43b0c57eb (diff) | |
download | kernel_samsung_espresso10-7e16c3a0a0ddbd5162b91e14a5e68587c9ecd142.zip kernel_samsung_espresso10-7e16c3a0a0ddbd5162b91e14a5e68587c9ecd142.tar.gz kernel_samsung_espresso10-7e16c3a0a0ddbd5162b91e14a5e68587c9ecd142.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>
Conflicts:
net/ipv4/ping.c
Change-Id: I51931e439cce7f19b4179f5828d7355bb3b1dcfa
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 0ae2cf1..a9ee19d 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -202,26 +202,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) |