Merge tag 'batadv-net-for-davem-20161202' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here is another batman-adv bugfix:

 - fix checking for failed allocation of TVLV blocks in TT local data,
   by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 7f663092f6de..0dc85eb1cb7a 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 */