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

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Included change:
- Check if the skb has been correctly prepared before going on
parents 8f9d5138 50fa3b31
...@@ -432,12 +432,16 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv, ...@@ -432,12 +432,16 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv,
switch (packet_type) { switch (packet_type) {
case BATADV_UNICAST: case BATADV_UNICAST:
batadv_unicast_prepare_skb(skb, orig_node); if (!batadv_unicast_prepare_skb(skb, orig_node))
goto out;
header_len = sizeof(struct batadv_unicast_packet); header_len = sizeof(struct batadv_unicast_packet);
break; break;
case BATADV_UNICAST_4ADDR: case BATADV_UNICAST_4ADDR:
batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node, if (!batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node,
packet_subtype); packet_subtype))
goto out;
header_len = sizeof(struct batadv_unicast_4addr_packet); header_len = sizeof(struct batadv_unicast_4addr_packet);
break; break;
default: default:
......
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