Commit d0f9eca2 authored Mar 18, 2026 by Jakub Kicinski

linux-merge

Simon Wunderlich says:

====================
Here is a batman-adv bugfix:

- avoid OGM aggregation when skb tailroom is insufficient, by Yang Yang

* tag 'batadv-net-pullrequest-20260317' of https://git.open-mesh.org/linux-merge:
  batman-adv: avoid OGM aggregation when skb tailroom is insufficient
====================

Link: https://patch.msgid.link/20260317160002.1869478-1-sw@simonwunderlich.de


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents cf2ce96c 0d4aef63

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;