[B.A.T.M.A.N.] [PATCH] batman-adv: check for more space before accessing the skb
From: Antonio Quartulli <hidden>
Date: 2012-08-26 21:25:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Antonio Quartulli <hidden>
Date: 2012-08-26 21:25:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
In batadv_check_unicast_ttvn() the code accesses both the unicast header and the Ethernet header in the payload. For this reason pskb_may_pull() must be invoked to check for the required space. Signed-off-by: Antonio Quartulli <redacted> --- routing.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/routing.c b/routing.c
index 784e9cc..44109cc 100644
--- a/routing.c
+++ b/routing.c@@ -908,8 +908,12 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, bool tt_poss_change; int is_old_ttvn; - /* I could need to modify it */ - if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0) + /* check if there is enough data before accessing it */ + if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0) + return 0; + + /* create a copy of the skb (in case of for re-routing) to modify it. */ + if (skb_cow(skb, sizeof(*unicast_packet)) < 0) return 0; unicast_packet = (struct batadv_unicast_packet *)skb->data;
--
1.7.12