Commit 0d4aef63 authored Mar 14, 2026 by Yang Yang Committed by Simon Wunderlich Mar 14, 2026

batman-adv: avoid OGM aggregation when skb tailroom is insufficient



When OGM aggregation state is toggled at runtime, an existing forwarded
packet may have been allocated with only packet_len bytes, while a later
packet can still be selected for aggregation. Appending in this case can
hit skb_put overflow conditions.

Reject aggregation when the target skb tailroom cannot accommodate the new
packet. The caller then falls back to creating a new forward packet
instead of appending.

Fixes: c6c8fea2 ("net: Add batman-adv meshing protocol")
Cc: stable@vger.kernel.org
Reported-by: Yifan Wu <yifanwucs@gmail.com>
Reported-by: Juefei Pu <tomapufckgml@gmail.com>
Signed-off-by: Yuan Tan <tanyuan98@outlook.com>
Signed-off-by: Xin Liu <bird@lzu.edu.cn>
Signed-off-by: Ao Zhou <n05ec@lzu.edu.cn>
Signed-off-by: Yang Yang <n05ec@lzu.edu.cn>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

parent cfc83a3c

net/batman-adv/bat_iv_ogm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -473,6 +473,9 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
		if (aggregated_bytes > max_bytes)
		return false;

		if (skb_tailroom(forw_packet->skb) < packet_len)
		return false;

		if (packet_num >= BATADV_MAX_AGGREGATION_PACKETS)
		return false;