aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiaoming wang <xiaoming.wang@intel.com>2014-04-14 06:30:16 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-02-18 21:14:16 +0100
commit8d8a3ff29b9a29de28a18c801e29645c4383322a (patch)
tree98f6277eda5f6535e57906ecc53fe41b598013e1
parent6d4f32d4e5a544ae76447be454b261289b38a6bd (diff)
downloadkernel_samsung_smdk4412-replicant-6.0-alpha-0003.zip
kernel_samsung_smdk4412-replicant-6.0-alpha-0003.tar.gz
kernel_samsung_smdk4412-replicant-6.0-alpha-0003.tar.bz2
net: ipv4: current group_info should be put after using.replicant-6.0-alpha-0003
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>
-rw-r--r--net/ipv4/ping.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 140d420..93fbd72 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);