Skip to content

Commit d0f9eca

Browse files
committed
Merge tag 'batadv-net-pullrequest-20260317' of https://git.open-mesh.org/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>
2 parents cf2ce96 + 0d4aef6 commit d0f9eca

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/batman-adv/bat_iv_ogm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
473473
if (aggregated_bytes > max_bytes)
474474
return false;
475475

476+
if (skb_tailroom(forw_packet->skb) < packet_len)
477+
return false;
478+
476479
if (packet_num >= BATADV_MAX_AGGREGATION_PACKETS)
477480
return false;
478481

0 commit comments

Comments
 (0)