diff options
| author | Antonio Quartulli <ordex@autistici.org> | 2012-01-06 21:31:33 +0100 |
|---|---|---|
| committer | Marek Lindner <lindner_marek@yahoo.de> | 2012-02-17 02:50:21 +0800 |
| commit | c40ed2bfa6cc30174d5c547b37bcd6528c830ef4 (patch) | |
| tree | 311997f241af6d9550321958fc57f6838727a670 /net | |
| parent | 567db7b0b7c0a94cc62846f8ebb429bdda2884bc (diff) | |
| download | op-kernel-dev-c40ed2bfa6cc30174d5c547b37bcd6528c830ef4.zip op-kernel-dev-c40ed2bfa6cc30174d5c547b37bcd6528c830ef4.tar.gz | |
batman-adv: set TT_CLIENT_NEW flag before invoking hash_add()
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/translation-table.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 4dc5af3..9be9c41 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -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); @@ -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); |
