batman-adv: tp_meter: avoid role confusion in tp_list

Session lookups in tp_list matched only on destination address (and
optionally session ID), leaving role validation to the caller. If two
sessions with the same other_end coexisted (one as sender, one as receiver)
a lookup could silently return the wrong one, causing the caller's role to
bail out early, potentially skipping necessary cleanup.

Move the role check into the lookup functions themselves so the correct
entry is always returned, or none at all. Since batadv_tp_start()
legitimately needs to detect any active session to a destination regardless
of role, introduce a dedicated helper for that case rather than bending the
existing lookup semantics.

Cc: stable@kernel.org
Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation")
Signed-off-by: Sven Eckelmann <sven@narfation.org>

diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 3ce6d9b2c9f3b4959fbd1aa8cbbafa1a617ef9e6..0fc4ca78e84ebee217e3b4371f7b53288c3743b2 100644 (file)
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -255,6 +255,7 @@ static void batadv_tp_batctl_error_notify(enum batadv_tp_meter_reason reason,
  * batadv_tp_list_find() - find a tp_vars object in the global list
  * @bat_priv: the bat priv with all the mesh interface information
  * @dst: the other endpoint MAC address to look for
+ * @role: role of the session
  *
  * Look for a tp_vars object matching dst as end_point and return it after
  * having increment the refcounter. Return NULL is not found
@@ -262,7 +263,8 @@ static void batadv_tp_batctl_error_notify(enum batadv_tp_meter_reason reason,
  * Return: matching tp_vars or NULL when no tp_vars with @dst was found
  */
 static struct batadv_tp_vars *batadv_tp_list_find(struct batadv_priv *bat_priv,
-                                                 const u8 *dst)
+                                                 const u8 *dst,
+                                                 enum batadv_tp_meter_role role)
 {
        struct batadv_tp_vars *pos, *tp_vars = NULL;
 
@@ -271,6 +273,9 @@ static struct batadv_tp_vars *batadv_tp_list_find(struct batadv_priv *bat_priv,
                if (!batadv_compare_eth(pos->other_end, dst))
                        continue;
 
+               if (pos->role != role)
+                       continue;
+
                /* most of the time this function is invoked during the normal
                 * process..it makes sens to pay more when the session is
                 * finished and to speed the process up during the measurement
@@ -286,12 +291,33 @@ static struct batadv_tp_vars *batadv_tp_list_find(struct batadv_priv *bat_priv,
        return tp_vars;
 }
 
+/**
+ * batadv_tp_list_active() - check if session from/to destination is ongoing
+ * @bat_priv: the bat priv with all the mesh interface information
+ * @dst: the other endpoint MAC address to look for
+ *
+ * Return: if matching session with @dst was found
+ */
+static bool batadv_tp_list_active(struct batadv_priv *bat_priv, const u8 *dst)
+       __must_hold(&bat_priv->tp_list_lock)
+{
+       struct batadv_tp_vars *tp_vars;
+
+       hlist_for_each_entry_rcu(tp_vars, &bat_priv->tp_list, list) {
+               if (batadv_compare_eth(tp_vars->other_end, dst))
+                       return true;
+       }
+
+       return false;
+}
+
 /**
  * batadv_tp_list_find_session() - find tp_vars session object in the global
  *  list
  * @bat_priv: the bat priv with all the mesh interface information
  * @dst: the other endpoint MAC address to look for
  * @session: session identifier
+ * @role: role of the session
  *
  * Look for a tp_vars object matching dst as end_point, session as tp meter
  * session and return it after having increment the refcounter. Return NULL
@@ -301,7 +327,7 @@ static struct batadv_tp_vars *batadv_tp_list_find(struct batadv_priv *bat_priv,
  */
 static struct batadv_tp_vars *
 batadv_tp_list_find_session(struct batadv_priv *bat_priv, const u8 *dst,
-                           const u8 *session)
+                           const u8 *session, enum batadv_tp_meter_role role)
 {
        struct batadv_tp_vars *pos, *tp_vars = NULL;
 
@@ -313,6 +339,9 @@ batadv_tp_list_find_session(struct batadv_priv *bat_priv, const u8 *dst,
                if (memcmp(pos->session, session, sizeof(pos->session)) != 0)
                        continue;
 
+               if (pos->role != role)
+                       continue;
+
                /* most of the time this function is invoked during the normal
                 * process..it makes sense to pay more when the session is
                 * finished and to speed the process up during the measurement
@@ -665,13 +694,10 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv,
 
        /* find the tp_vars */
        tp_vars = batadv_tp_list_find_session(bat_priv, icmp->orig,
-                                             icmp->session);
+                                             icmp->session, BATADV_TP_SENDER);
        if (unlikely(!tp_vars))
                return;
 
-       if (unlikely(tp_vars->role != BATADV_TP_SENDER))
-               goto out;
-
        if (unlikely(batadv_tp_sender_stopped(tp_vars)))
                goto out;
 
@@ -980,10 +1006,8 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,
                return;
        }
 
-       tp_vars = batadv_tp_list_find(bat_priv, dst);
-       if (tp_vars) {
+       if (batadv_tp_list_active(bat_priv, dst)) {
                spin_unlock_bh(&bat_priv->tp_list_lock);
-               batadv_tp_vars_put(tp_vars);
                batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
                           "Meter: test to or from the same node already ongoing, aborting\n");
                batadv_tp_batctl_error_notify(BATADV_TP_REASON_ALREADY_ONGOING,
@@ -1104,18 +1128,14 @@ void batadv_tp_stop(struct batadv_priv *bat_priv, const u8 *dst,
        if (!orig_node)
                return;
 
-       tp_vars = batadv_tp_list_find(bat_priv, orig_node->orig);
+       tp_vars = batadv_tp_list_find(bat_priv, orig_node->orig, BATADV_TP_SENDER);
        if (!tp_vars) {
                batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
                           "Meter: trying to interrupt an already over connection\n");
                goto out_put_orig_node;
        }
 
-       if (unlikely(tp_vars->role != BATADV_TP_SENDER))
-               goto out_put_tp_vars;
-
        batadv_tp_sender_shutdown(tp_vars, return_value);
-out_put_tp_vars:
        batadv_tp_vars_put(tp_vars);
 out_put_orig_node:
        batadv_orig_node_put(orig_node);
@@ -1371,7 +1391,7 @@ batadv_tp_init_recv(struct batadv_priv *bat_priv,
                goto out_unlock;
 
        tp_vars = batadv_tp_list_find_session(bat_priv, icmp->orig,
-                                             icmp->session);
+                                             icmp->session, BATADV_TP_RECEIVER);
        if (tp_vars)
                goto out_unlock;
 
@@ -1442,7 +1462,7 @@ static void batadv_tp_recv_msg(struct batadv_priv *bat_priv,
                }
        } else {
                tp_vars = batadv_tp_list_find_session(bat_priv, icmp->orig,
-                                                     icmp->session);
+                                                     icmp->session, BATADV_TP_RECEIVER);
                if (!tp_vars) {
                        batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
                                   "Unexpected packet from %pM!\n",
@@ -1451,13 +1471,6 @@ static void batadv_tp_recv_msg(struct batadv_priv *bat_priv,
                }
        }
 
-       if (unlikely(tp_vars->role != BATADV_TP_RECEIVER)) {
-               batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
-                          "Meter: dropping packet: not expected (role=%u)\n",
-                          tp_vars->role);
-               goto out;
-       }
-
        tp_vars->last_recv_time = jiffies;
 
        /* if the packet is a duplicate, it may be the case that an ACK has been