---

yaml --- r: 328412 b: refs/heads/master c: f674e72 h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · 0fbcd96 · 0fbcd96
1 parent cac54c4
commit 0fbcd96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862096a8bbf8f992f6d0a1a8786ffd3fc7437e48
+refs/heads/master: f674e72ff1aad23a99c7c205473cf02c85c2ac33
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
@@ -1923,6 +1923,9 @@ parse_ipsecrequests(struct xfrm_policy *xp, struct sadb_x_policy *pol)
 	int len = pol->sadb_x_policy_len*8 - sizeof(struct sadb_x_policy);
 	struct sadb_x_ipsecrequest *rq = (void*)(pol+1);
 
+	if (pol->sadb_x_policy_len * 8 < sizeof(struct sadb_x_policy))
+		return -EINVAL;
+
 	while (len >= sizeof(struct sadb_x_ipsecrequest)) {
 		if ((err = parse_ipsecrequest(xp, rq)) < 0)
 			return err;