lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Included change:
- Check if the skb has been correctly prepared before going on
This commit is contained in:
David S. Miller
2013-08-20 16:54:29 -07:00
parent 8f9d513803 50fa3b31f4
commit cc666c53cc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/batman-adv/unicast.c
View File

@@ -432,12 +432,16 @@ find_router:
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: