83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
From 1798ad3fb6ba72f8c6f96024b27ad27193648787 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
|
|
Date: Fri, 3 Jul 2015 18:29:59 +0200
|
|
Subject: [PATCH 17/17] batman-adv: Fix broken MCAST capability check
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The introduction of set_bit() and clear_bit() calls in batman-adv
|
|
wrongly passed bitmasks and not the bit numbers to these functions.
|
|
This leads to broken capability checks.
|
|
|
|
Fixing this by making the capability enum a non-bitmasked one and by
|
|
that passing non-masked values to set_bit()/clear_bit().
|
|
|
|
Fixes: 201a54ba710a ("batman-adv: Make MCAST capability changes atomic")
|
|
Reported-by: Def <def@laposte.net>
|
|
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
multicast.c | 11 ++++++-----
|
|
types.h | 2 +-
|
|
2 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/multicast.c b/multicast.c
|
|
index b75bcc3..ee8317f 100644
|
|
--- a/multicast.c
|
|
+++ b/multicast.c
|
|
@@ -709,14 +709,15 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
|
|
mcast_flags = *(uint8_t *)tvlv_value;
|
|
|
|
spin_lock_bh(&orig->mcast_handler_lock);
|
|
- orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
|
|
+ orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
|
|
+ &orig->capa_initialized);
|
|
|
|
/* If mcast support is turned on decrease the disabled mcast node
|
|
* counter only if we had increased it for this node before. If this
|
|
* is a completely new orig_node no need to decrease the counter.
|
|
*/
|
|
if (orig_mcast_enabled &&
|
|
- !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
|
|
+ !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) {
|
|
if (orig_initialized)
|
|
atomic_dec(&bat_priv->mcast.num_disabled);
|
|
set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
|
|
@@ -725,7 +726,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
|
|
* node counter.
|
|
*/
|
|
} else if (!orig_mcast_enabled &&
|
|
- (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
|
|
+ (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) ||
|
|
!orig_initialized)) {
|
|
atomic_inc(&bat_priv->mcast.num_disabled);
|
|
clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
|
|
@@ -774,8 +775,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
|
|
|
|
spin_lock_bh(&orig->mcast_handler_lock);
|
|
|
|
- if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
|
|
- orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
|
|
+ if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) &&
|
|
+ test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))
|
|
atomic_dec(&bat_priv->mcast.num_disabled);
|
|
|
|
batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
|
|
diff --git a/types.h b/types.h
|
|
index 6f4486c..3baf595 100644
|
|
--- a/types.h
|
|
+++ b/types.h
|
|
@@ -302,7 +302,7 @@ enum batadv_orig_capabilities {
|
|
BATADV_ORIG_CAPA_HAS_DAT,
|
|
BATADV_ORIG_CAPA_HAS_NC,
|
|
BATADV_ORIG_CAPA_HAS_TT,
|
|
- BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
|
|
+ BATADV_ORIG_CAPA_HAS_MCAST,
|
|
};
|
|
|
|
/**
|
|
--
|
|
2.1.4
|
|
|