From: Simon Wunderlich <sw@simonwunderlich.de>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
stable@kernel.org, Yuan Tan <yuantan098@gmail.com>,
Yifan Wu <yifanwucs@gmail.com>,
Juefei Pu <tomapufckgml@gmail.com>, Xin Liu <bird@lzu.edu.cn>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH net 12/14] batman-adv: tp_meter: avoid use of uninit sender vars
Date: Fri, 15 May 2026 11:55:37 +0200 [thread overview]
Message-ID: <20260515095540.325586-13-sw@simonwunderlich.de> (raw)
In-Reply-To: <20260515095540.325586-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
batadv_tp_recv_ack() and batadv_tp_stop() are only valid for tp_vars in the
BATADV_TP_SENDER role. When called with a BATADV_TP_RECEIVER role, it
proceeds to read sender-only members that were never initialized, leading
to undefined behavior.
This can be triggered when a node that is currently acting as a receiver in
an ongoing tp_meter session receives a malicious ACK packet.
Guard against this by checking tp_vars->role immediately after the
lookup and bailing out if it is not BATADV_TP_SENDER, before any of
those members are accessed.
Cc: stable@kernel.org
Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation")
Reported-by: Yuan Tan <yuantan098@gmail.com>
Reported-by: Yifan Wu <yifanwucs@gmail.com>
Reported-by: Juefei Pu <tomapufckgml@gmail.com>
Reported-by: Xin Liu <bird@lzu.edu.cn>
Reviewed-by: Yuan Tan <yuantan098@gmail.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/tp_meter.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index ca6c3f6374bc5..a3593d104caa5 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -664,6 +664,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv,
if (unlikely(!tp_vars))
return;
+ if (unlikely(tp_vars->role != BATADV_TP_SENDER))
+ goto out;
+
if (unlikely(atomic_read(&tp_vars->sending) == 0))
goto out;
@@ -1101,12 +1104,16 @@ void batadv_tp_stop(struct batadv_priv *bat_priv, const u8 *dst,
if (!tp_vars) {
batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
"Meter: trying to interrupt an already over connection\n");
- goto out;
+ 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:
+out_put_orig_node:
batadv_orig_node_put(orig_node);
}
--
2.47.3
next prev parent reply other threads:[~2026-05-15 9:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 9:55 [PATCH net 00/14] pull request: batman-adv 2026-05-15 Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 01/14] batman-adv: fix tp_meter counter underflow during shutdown Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 02/14] batman-adv: tp_meter: fix tp_vars reference leak in receiver shutdown Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 03/14] batman-adv: tt: reject oversized local TVLV buffers Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 04/14] batman-adv: tt: fix negative tt_buff_len Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 05/14] batman-adv: tt: fix negative last_changeset_len Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 06/14] batman-adv: tt: fix TOCTOU race for reported vlans Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 07/14] batman-adv: tt: avoid empty VLAN responses Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 08/14] batman-adv: tt: prevent TVLV entry number overflow Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 09/14] batman-adv: fix fragment reassembly length accounting Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 10/14] batman-adv: clear current gateway during teardown Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 11/14] batman-adv: dat: handle forward allocation error Simon Wunderlich
2026-05-15 9:55 ` Simon Wunderlich [this message]
2026-05-15 9:55 ` [PATCH net 13/14] batman-adv: frag: disallow unicast fragment in fragment Simon Wunderlich
2026-05-15 9:55 ` [PATCH net 14/14] batman-adv: tp_meter: directly shut down timer on cleanup Simon Wunderlich
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=20260515095540.325586-13-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bird@lzu.edu.cn \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@kernel.org \
--cc=sven@narfation.org \
--cc=tomapufckgml@gmail.com \
--cc=yifanwucs@gmail.com \
--cc=yuantan098@gmail.com \
/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