diff options
| author | Linus Lüssing <linus.luessing@c0d3.blue> | 2018-06-07 00:46:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-24 13:09:05 +0200 |
| commit | 44fed77fc7e45e0fe6c41286df9134d747b2bd73 (patch) | |
| tree | e329f80faf9ddb8fbadab0c7e61ae000288ed05e | |
| parent | d50e1f18eacef0a50be5a20da2dc1c8cc8af544b (diff) | |
| download | linux-44fed77fc7e45e0fe6c41286df9134d747b2bd73.tar.gz | |
batman-adv: Avoid storing non-TT-sync flags on singular entries too
[ Upstream commit 4a519b83da16927fb98fd32b0f598e639d1f1859 ]
Since commit 54e22f265e87 ("batman-adv: fix TT sync flag inconsistencies")
TT sync flags and TT non-sync'd flags are supposed to be stored
separately.
The previous patch missed to apply this separation on a TT entry with
only a single TT orig entry.
This is a minor fix because with only a single TT orig entry the DDoS
issue the former patch solves does not apply.
Fixes: 54e22f265e87 ("batman-adv: fix TT sync flag inconsistencies")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/batman-adv/translation-table.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 8a3ce79b1307b7..e14f7c6436b4c4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1679,7 +1679,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ether_addr_copy(common->addr, tt_addr); common->vid = vid; - common->flags = flags; + common->flags = flags & (~BATADV_TT_SYNC_MASK); + tt_global_entry->roam_at = 0; /* node must store current time in case of roaming. This is * needed to purge this entry out on timeout (if nobody claims |