b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
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>,
	"Simon Wunderlich" <sw@simonwunderlich.de>
Subject: [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Fix multicast TT issues with bogus ROAM flags
Date: Tue, 17 Jul 2018 17:19:46 +0200	[thread overview]
Message-ID: <20180717151946.31900-7-sw@simonwunderlich.de> (raw)
In-Reply-To: <20180717151946.31900-1-sw@simonwunderlich.de>

From: Linus Lüssing <linus.luessing@c0d3.blue>

When a (broken) node wrongly sends multicast TT entries with a ROAM
flag then this causes any receiving node to drop all entries for the
same multicast MAC address announced by other nodes, leading to
packet loss.

Fix this DoS vector by only storing TT sync flags. For multicast TT
non-sync'ing flag bits like ROAM are unused so far anyway.

Fixes: 1d8ab8d3c176 ("batman-adv: Modified forwarding behaviour for multicast packets")
Reported-by: Leonardo Mörlein <me@irrelefant.net>
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 net/batman-adv/translation-table.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 61ce300091f3..12a2b7d21376 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 & (~BATADV_TT_SYNC_MASK);
+		if (!is_multicast_ether_addr(common->addr))
+			common->flags = flags & (~BATADV_TT_SYNC_MASK);
 
 		tt_global_entry->roam_at = 0;
 		/* node must store current time in case of roaming. This is
@@ -1769,7 +1770,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
 		 * TT_CLIENT_TEMP, therefore they have to be copied in the
 		 * client entry
 		 */
-		common->flags |= flags & (~BATADV_TT_SYNC_MASK);
+		if (!is_multicast_ether_addr(common->addr))
+			common->flags |= flags & (~BATADV_TT_SYNC_MASK);
 
 		/* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
 		 * one originator left in the list and we previously received a
-- 
2.11.0


  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 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Avoid storing non-TT-sync flags on singular entries too Simon Wunderlich
2018-07-17 15:19 ` Simon Wunderlich [this message]
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-7-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 \
    /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).