[quantal,1/1] net: ipv4: current group_info should be put after using.
diff mbox

Message ID 1398429040-12559-4-git-send-email-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft April 25, 2014, 12:30 p.m. UTC
From: "Wang, Xiaoming" <xiaoming.wang@intel.com>

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>

(backported from commit b04c46190219a4f845e46a459e3102137b7f6cac)
CVE-2014-2851
Conflicts:
	net/ipv4/ping.c
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 net/ipv4/ping.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Patch
diff mbox

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 80c0847..83535ae 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -205,9 +205,10 @@  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;
 	kgid_t low, high;
+	int ret = 0;
 
 	inet_get_ping_group_range_net(net, range, range+1);
 	low = make_kgid(&init_user_ns, range[0]);
@@ -218,18 +219,24 @@  static int ping_init_sock(struct sock *sk)
 	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++) {
 			kgid_t gid = group_info->blocks[i][j];
 			if (gid_lte(low, gid) && gid_lte(gid, high))
-				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)