[B.A.T.M.A.N.] [PATCH] batman-adv: check for more space before accessing the skb

[B.A.T.M.A.N.] [PATCH] batman-adv: check for more space before accessing the skb

[Antonio Quartulli]

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 <ordex@autistici.org>
---
 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

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: check for more space before accessing the skb

[Marek Lindner]

On Monday, August 27, 2012 05:25:59 Antonio Quartulli wrote:
> 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 <ordex@autistici.org>
> ---
>  routing.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Applied in revision 94494a1.

Thanks,
Marek