| From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue> |
| Date: Thu, 7 Jun 2018 00:46:23 +0200 |
| Subject: batman-adv: Avoid storing non-TT-sync flags on singular entries too |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 4a519b83da16927fb98fd32b0f598e639d1f1859 upstream. |
| |
| 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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| net/batman-adv/translation-table.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/batman-adv/translation-table.c |
| +++ b/net/batman-adv/translation-table.c |
| @@ -1378,7 +1378,8 @@ static bool batadv_tt_global_add(struct |
| 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 |
