[patch] net/key/af_key.c: add range checks on ->sadb_x_policy_len

Subsystems: networking [general], networking [ipsec], the rest

STALE5061d

2 messages, 2 authors, 2012-10-01 · open the first message on its own page

[patch] net/key/af_key.c: add range checks on ->sadb_x_policy_len

From: Dan Carpenter <hidden>
Date: 2012-09-28 08:21:33

Because sizeof() is size_t then if "len" is negative, it counts as a
large positive value.

The call tree looks like:
pfkey_sendmsg()
-> pfkey_process()
   -> pfkey_spdadd()
      -> parse_ipsecrequests()

Signed-off-by: Dan Carpenter <redacted>
---
This is a static checker fix.  I'm not very familiar with this code.
I think if we were to hit this then we would try to parse invalid data
and it would return -EINVAL or similar error code pretty quickly.
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 2ca7d7f..7714df0 100644
--- a/net/key/af_key.c
+++ b/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;

Re: [patch] net/key/af_key.c: add range checks on ->sadb_x_policy_len

From: David Miller <davem@davemloft.net>
Date: 2012-10-01 21:15:33

From: Dan Carpenter <redacted>
Date: Fri, 28 Sep 2012 11:21:19 +0300
Because sizeof() is size_t then if "len" is negative, it counts as a
large positive value.

The call tree looks like:
pfkey_sendmsg()
-> pfkey_process()
   -> pfkey_spdadd()
      -> parse_ipsecrequests()

Signed-off-by: Dan Carpenter <redacted>
---
This is a static checker fix.  I'm not very familiar with this code.
I think if we were to hit this then we would try to parse invalid data
and it would return -EINVAL or similar error code pretty quickly.
Applied and queued up for -stable, thanks Dan.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help