8387f7c9d4
* batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv * batman-adv: Revert "fix splat on disabling an interface" * batman-adv: Detect missing primaryif during tp_send as error * batman-adv: Check for alloc errors when preparing TT local data Signed-off-by: Sven Eckelmann <sven@narfation.org>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Wed, 30 Nov 2016 21:47:09 +0100
|
|
Subject: [PATCH] batman-adv: Check for alloc errors when preparing TT local data
|
|
|
|
batadv_tt_prepare_tvlv_local_data can fail to allocate the memory for the
|
|
new TVLV block. The caller is informed about this problem with the returned
|
|
length of 0. Not checking this value results in an invalid memory access
|
|
when either tt_data or tt_change is accessed.
|
|
|
|
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
|
---
|
|
net/batman-adv/translation-table.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
|
|
index 7f66309..0dc85eb 100644
|
|
--- a/net/batman-adv/translation-table.c
|
|
+++ b/net/batman-adv/translation-table.c
|
|
@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
|
|
&tvlv_tt_data,
|
|
&tt_change,
|
|
&tt_len);
|
|
- if (!tt_len)
|
|
+ if (!tt_len || !tvlv_len)
|
|
goto unlock;
|
|
|
|
/* Copy the last orig_node's OGM buffer */
|
|
@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
|
|
&tvlv_tt_data,
|
|
&tt_change,
|
|
&tt_len);
|
|
- if (!tt_len)
|
|
+ if (!tt_len || !tvlv_len)
|
|
goto out;
|
|
|
|
/* fill the rest of the tvlv with the real TT entries */
|