diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-18 15:36:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-18 15:36:59 -0400 |
| commit | db0fe0b2f6bba2fda939737d063db2ae14c58d71 (patch) | |
| tree | dc978ed71a75357a5858f6ef84665f9095a65451 /net/batman-adv/routing.c | |
| parent | a3374c42aa5f7237e87ff3b0622018636b0c847e (diff) | |
| parent | 7dac7b76b8db87fc79857a53a09730fb2148579b (diff) | |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Included fixes:
- Fix broadcast packet CRC calculation which can lead to ~80% broadcast packet
loss
- Fix a race condition in duplicate broadcast packet check
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 939fc01371df..376b4cc6ca82 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1124,8 +1124,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ |