net: ipv4: current group_info should be put after using.
[ Upstream commit b04c461902
]
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>
This commit is contained in:
parent
f39b7458ab
commit
2089f7346a
|
@ -252,26 +252,33 @@ int ping_init_sock(struct sock *sk)
|
||||||
{
|
{
|
||||||
struct net *net = sock_net(sk);
|
struct net *net = sock_net(sk);
|
||||||
kgid_t group = current_egid();
|
kgid_t group = current_egid();
|
||||||
struct group_info *group_info = get_current_groups();
|
struct group_info *group_info;
|
||||||
int i, j, count = group_info->ngroups;
|
int i, j, count;
|
||||||
kgid_t low, high;
|
kgid_t low, high;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
inet_get_ping_group_range_net(net, &low, &high);
|
inet_get_ping_group_range_net(net, &low, &high);
|
||||||
if (gid_lte(low, group) && gid_lte(group, high))
|
if (gid_lte(low, group) && gid_lte(group, high))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
group_info = get_current_groups();
|
||||||
|
count = group_info->ngroups;
|
||||||
for (i = 0; i < group_info->nblocks; i++) {
|
for (i = 0; i < group_info->nblocks; i++) {
|
||||||
int cp_count = min_t(int, NGROUPS_PER_BLOCK, count);
|
int cp_count = min_t(int, NGROUPS_PER_BLOCK, count);
|
||||||
for (j = 0; j < cp_count; j++) {
|
for (j = 0; j < cp_count; j++) {
|
||||||
kgid_t gid = group_info->blocks[i][j];
|
kgid_t gid = group_info->blocks[i][j];
|
||||||
if (gid_lte(low, gid) && gid_lte(gid, high))
|
if (gid_lte(low, gid) && gid_lte(gid, high))
|
||||||
return 0;
|
goto out_release_group;
|
||||||
}
|
}
|
||||||
|
|
||||||
count -= cp_count;
|
count -= cp_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -EACCES;
|
ret = -EACCES;
|
||||||
|
|
||||||
|
out_release_group:
|
||||||
|
put_group_info(group_info);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(ping_init_sock);
|
EXPORT_SYMBOL_GPL(ping_init_sock);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue