dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

batman-adv: Fix broadcast duplist for fragmentation 

If the skb is fragmented, the checksum must be computed on the
individual fragments, just using skb->data may fail on fragmented
data. Instead of doing linearizing the packet, use the new
batadv_crc32 to do that more efficiently- it should not hurt
replacing the old crc16 by the new crc32.

Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
This commit is contained in:
Simon Wunderlich 2012-10-18 13:47:42 +02:00 committed by Antonio Quartulli
parent 95a066d82c
commit 004e86fc58
4 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/batman-adv/bridge_loop_avoidance.c
View File

@ -1249,8 +1249,7 @@ int batadv_bla_init(struct batadv_priv *bat_priv)
/** /**
* batadv_bla_check_bcast_duplist * batadv_bla_check_bcast_duplist
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @bcast_packet: encapsulated broadcast frame plus batman header * @skb: contains the bcast_packet to be checked
* @bcast_packet_len: length of encapsulated broadcast frame plus batman header
* *
* check if it is on our broadcast list. Another gateway might * check if it is on our broadcast list. Another gateway might
* have sent the same packet because it is connected to the same backbone, * have sent the same packet because it is connected to the same backbone,
@ -1262,20 +1261,17 @@ int batadv_bla_init(struct batadv_priv *bat_priv)
* the same host however as this might be intended. * the same host however as this might be intended.
*/ */
int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
struct batadv_bcast_packet *bcast_packet, struct sk_buff *skb)
int bcast_packet_len)
{ {
int i, length, curr, ret = 0; int i, curr, ret = 0;
uint8_t *content; __be32 crc;
uint16_t crc; struct batadv_bcast_packet *bcast_packet;
struct batadv_bcast_duplist_entry *entry; struct batadv_bcast_duplist_entry *entry;
length = bcast_packet_len - sizeof(*bcast_packet); bcast_packet = (struct batadv_bcast_packet *)skb->data;
content = (uint8_t *)bcast_packet;
content += sizeof(*bcast_packet);
/* calculate the crc ... */ /* calculate the crc ... */
crc = crc16(0, content, length); crc = batadv_skb_crc32(skb, (u8 *)(bcast_packet + 1));
spin_lock_bh(&bat_priv->bla.bcast_duplist_lock); spin_lock_bh(&bat_priv->bla.bcast_duplist_lock);

6
net/batman-adv/bridge_loop_avoidance.h
View File

@ -31,8 +31,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq,
void *offset); void *offset);
int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig); int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig);
int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
struct batadv_bcast_packet *bcast_packet, struct sk_buff *skb);
int hdr_size);
void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
struct batadv_hard_iface *primary_if, struct batadv_hard_iface *primary_if,
struct batadv_hard_iface *oldif); struct batadv_hard_iface *oldif);
@ -81,8 +80,7 @@ static inline int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv,
static inline int static inline int
batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
struct batadv_bcast_packet *bcast_packet, struct sk_buff *skb)
int hdr_size)
{ {
return 0; return 0;
} }

8
net/batman-adv/routing.c
View File

@ -1196,14 +1196,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
spin_unlock_bh(&orig_node->bcast_seqno_lock); 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 */ /* check whether this has been sent by another originator before */
if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) if (batadv_bla_check_bcast_duplist(bat_priv, skb))
goto out; goto out;
/* rebroadcast packet */ /* rebroadcast packet */

2
net/batman-adv/types.h
View File

@ -156,7 +156,7 @@ struct batadv_neigh_node {
#ifdef CONFIG_BATMAN_ADV_BLA #ifdef CONFIG_BATMAN_ADV_BLA
struct batadv_bcast_duplist_entry { struct batadv_bcast_duplist_entry {
uint8_t orig[ETH_ALEN]; uint8_t orig[ETH_ALEN];
uint16_t crc; __be32 crc;
unsigned long entrytime; unsigned long entrytime;
}; };
#endif #endif