35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From eabdc3175b1d119cd673f36d06264cddb4803ace Mon Sep 17 00:00:00 2001
|
|
From: Antonio Quartulli <antonio@meshcoding.com>
|
|
Date: Thu, 30 Jan 2014 00:12:24 +0100
|
|
Subject: [PATCH 06/13] batman-adv: properly check pskb_may_pull return value
|
|
|
|
pskb_may_pull() returns 1 on success and 0 in case of failure,
|
|
therefore checking for the return value being negative does
|
|
not make sense at all.
|
|
|
|
This way if the function fails we will probably read beyond the current
|
|
skb data buffer. Fix this by doing the proper check.
|
|
|
|
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
routing.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/routing.c b/routing.c
|
|
index f28920f..f7579d0 100644
|
|
--- a/routing.c
|
|
+++ b/routing.c
|
|
@@ -833,7 +833,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
|
|
int is_old_ttvn;
|
|
|
|
/* check if there is enough data before accessing it */
|
|
- if (pskb_may_pull(skb, hdr_len + ETH_HLEN) < 0)
|
|
+ if (!pskb_may_pull(skb, hdr_len + ETH_HLEN))
|
|
return 0;
|
|
|
|
/* create a copy of the skb (in case of for re-routing) to modify it. */
|
|
--
|
|
1.9.0.rc3
|
|
|