Skip to content

Commit

Permalink
batman-adv: set TT_CLIENT_NEW flag before invoking hash_add()
Browse files Browse the repository at this point in the history
In case of a new tt_local_entry, the TT_CLIENT_NEW flag has to be set before
adding such entry to the hash table. Otherwise, it opens a race condition
in which the entry can be found but the flag has not been set.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  • Loading branch information
Antonio Quartulli authored and Marek Lindner committed Feb 16, 2012
1 parent 567db7b commit c40ed2b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/batman-adv/translation-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
if (compare_eth(addr, soft_iface->dev_addr))
tt_local_entry->common.flags |= TT_CLIENT_NOPURGE;

/* The local entry has to be marked as NEW to avoid to send it in
* a full table response going out before the next ttvn increment
* (consistency check) */
tt_local_entry->common.flags |= TT_CLIENT_NEW;

hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig,
&tt_local_entry->common,
&tt_local_entry->common.hash_entry);
Expand All @@ -222,11 +227,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,

tt_local_event(bat_priv, addr, tt_local_entry->common.flags);

/* The local entry has to be marked as NEW to avoid to send it in
* a full table response going out before the next ttvn increment
* (consistency check) */
tt_local_entry->common.flags |= TT_CLIENT_NEW;

/* remove address from global hash if present */
tt_global_entry = tt_global_hash_find(bat_priv, addr);

Expand Down

0 comments on commit c40ed2b

Please sign in to comment.