Commit a38b6100 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 8dc0f265 c2d0f48a
...@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, ...@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
&tvlv_tt_data, &tvlv_tt_data,
&tt_change, &tt_change,
&tt_len); &tt_len);
if (!tt_len) if (!tt_len || !tvlv_len)
goto unlock; goto unlock;
/* Copy the last orig_node's OGM buffer */ /* Copy the last orig_node's OGM buffer */
...@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, ...@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
&tvlv_tt_data, &tvlv_tt_data,
&tt_change, &tt_change,
&tt_len); &tt_len);
if (!tt_len) if (!tt_len || !tvlv_len)
goto out; goto out;
/* fill the rest of the tvlv with the real TT entries */ /* fill the rest of the tvlv with the real TT entries */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment