batman-adv: Fix deletion of RTR(4|6) mcast list entries

PATCH In review Sven Eckelmann 2 participants 2 messages Jul 7, 2019 Batman advanced

Share & tools

Sven Eckelmann

author maintainer

2019-07-07 21:04 UTC #0 lore raw

PATCH 1/1 batman-adv: Fix deletion of RTR(4|6) mcast list entries

The multicast code uses the lists bat_priv->mcast.want_all_rtr*_list to store all all originator nodes which don't have the flag no-RTR4 or no-RTR6 set. When an originator is purged, it has to be removed from these lists.

Since all entries without the BATADV_MCAST_WANT_NO_RTR4/6 are stored in these lists, they have to be handled like entries which have these flags set to force the update routines to remove them from the lists when purging the originator.

Not doing so will leave a pointer to a freed memory region inside the list. Trying to operate on these lists will then cause an use-after-free error:

  BUG: KASAN: use-after-free in batadv_mcast_want_rtr4_update+0x335/0x3a0 [batman_adv]
  Write of size 8 at addr ffff888007b41a38 by task swapper/0/0

Fixes 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence")

Signed-off-by Sven Eckelmann <[email protected]>

---
Cc: Linus Lüssing <[email protected]>

See https://www.open-mesh.org/issues/395

---
 net/batman-adv/multicast.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

net/batman-adv/multicast.c +4 -2

index a3488cfb..1d5bdf3a 100644
@@ -2420,8 +2420,10 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
 	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
 	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);
 	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);
-	batadv_mcast_want_rtr4_update(bat_priv, orig, BATADV_NO_FLAGS);
-	batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_NO_FLAGS);
+	batadv_mcast_want_rtr4_update(bat_priv, orig,
+				      BATADV_MCAST_WANT_NO_RTR4);
+	batadv_mcast_want_rtr6_update(bat_priv, orig,
+				      BATADV_MCAST_WANT_NO_RTR6);
 
 	spin_unlock_bh(&orig->mcast_handler_lock);
 }

Signature · 1 line

2.20.1

Linus Lüssing

Acked-by on v1 1/1

2019-07-07 21:47 UTC #1 lore raw

Quoted 15 lines · Sven Eckelmann

The multicast code uses the lists bat_priv->mcast.want_all_rtr*_list to store all all originator nodes which don't have the flag no-RTR4 or no-RTR6 set. When an originator is purged, it has to be removed from these lists.
Since all entries without the BATADV_MCAST_WANT_NO_RTR4/6 are stored in these lists, they have to be handled like entries which have these flags set to force the update routines to remove them from the lists when purging the originator.
Not doing so will leave a pointer to a freed memory region inside the list. Trying to operate on these lists will then cause an use-after-free error:
  BUG: KASAN: use-after-free in batadv_mcast_want_rtr4_update+0x335/0x3a0 [batman_adv]
  Write of size 8 at addr ffff888007b41a38 by task swapper/0/0

Quoted 7 lines

Fixes 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence")
Signed-off-by Sven Eckelmann <[email protected]>
---
Cc: Linus Lüssing <[email protected]>
See https://www.open-mesh.org/issues/395
---

Acked-by Linus Lüssing <[email protected]>