From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
"Linus Lüssing" <linus.luessing@c0d3.blue>,
"Sven Eckelmann" <sven@narfation.org>,
"Simon Wunderlich" <sw@simonwunderlich.de>
Subject: [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Avoid storing non-TT-sync flags on singular entries too
Date: Tue, 17 Jul 2018 17:19:45 +0200 [thread overview]
Message-ID: <20180717151946.31900-6-sw@simonwunderlich.de> (raw)
In-Reply-To: <20180717151946.31900-1-sw@simonwunderlich.de>
From: Linus Lüssing <linus.luessing@c0d3.blue>
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>
---
net/batman-adv/translation-table.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 3986551397ca..61ce300091f3 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1705,7 +1705,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
--
2.11.0
next prev parent reply other threads:[~2018-07-17 15:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 15:19 [B.A.T.M.A.N.] [PATCH 0/6] pull request for net: batman-adv 2018-07-17 Simon Wunderlich
2018-07-17 15:19 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump Simon Wunderlich
2018-07-17 15:19 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Fix bat_v " Simon Wunderlich
2018-07-17 15:19 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Fix debugfs path for renamed hardif Simon Wunderlich
2018-07-17 15:19 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: Fix debugfs path for renamed softif Simon Wunderlich
2018-07-17 15:19 ` Simon Wunderlich [this message]
2018-07-17 15:19 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Fix multicast TT issues with bogus ROAM flags Simon Wunderlich
2018-07-18 20:50 ` [B.A.T.M.A.N.] [PATCH 0/6] pull request for net: batman-adv 2018-07-17 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180717151946.31900-6-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=linus.luessing@c0d3.blue \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).