Skip to content

Commit 548b0c5

Browse files
ecsvsimonwunderlich
authored andcommitted
batman-adv: Ignore own maximum aggregation size during RX
An OGMv1 and OGMv2 packet receive processing were not only limited by the number of bytes in the received packet but also by the nodes maximum aggregation packet size limit. But this limit is relevant for TX and not for RX. It must not be enforced by batadv_(i)v_ogm_aggr_packet to avoid loss of information in case of a different limit for sender and receiver. This has a minor side effect for B.A.T.M.A.N. IV because the batadv_iv_ogm_aggr_packet is also used for the preprocessing for the TX. But since the aggregation code itself will not allow more than BATADV_MAX_AGGREGATION_BYTES bytes, this check was never triggering (in this context) prior of removing it. Cc: stable@vger.kernel.org Fixes: c6c8fea ("net: Add batman-adv meshing protocol") Fixes: 9323158 ("batman-adv: OGMv2 - implement originators logic") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
1 parent f4c9c2c commit 548b0c5

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

net/batman-adv/bat_iv_ogm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,7 @@ batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
325325
/* check if there is enough space for the optional TVLV */
326326
next_buff_pos += ntohs(ogm_packet->tvlv_len);
327327

328-
return (next_buff_pos <= packet_len) &&
329-
(next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
328+
return next_buff_pos <= packet_len;
330329
}
331330

332331
/* send a batman ogm to a given interface */

net/batman-adv/bat_v_ogm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,7 @@ batadv_v_ogm_aggr_packet(int buff_pos, int packet_len,
839839
/* check if there is enough space for the optional TVLV */
840840
next_buff_pos += ntohs(ogm2_packet->tvlv_len);
841841

842-
return (next_buff_pos <= packet_len) &&
843-
(next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
842+
return next_buff_pos <= packet_len;
844843
}
845844

846845
/**

0 commit comments

Comments
 (0)