Commit 51c6b429 authored Feb 13, 2017 by Linus Lüssing Committed by Simon Wunderlich Feb 21, 2017

batman-adv: Fix transmission of final, 16th fragment



Trying to split and transmit a unicast packet in 16 parts will fail for
the final fragment: After having sent the 15th one with a frag_packet.no
index of 14, we will increase the the index to 15 - and return with an
error code immediately, even though one more fragment is due for
transmission and allowed.

Fixing this issue by moving the check before incrementing the index.

While at it, adding an unlikely(), because the check is actually more of
an assertion.

Fixes: ee75ed88 ("batman-adv: Fragment and send skbs larger than mtu")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

parent 248e23b5

net/batman-adv/fragmentation.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -501,6 +501,12 @@ int batadv_frag_send_packet(struct sk_buff *skb,

		/* Eat and send fragments from the tail of skb */
		while (skb->len > max_fragment_size) {
		/* The initial check in this function should cover this case */
		if (unlikely(frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1)) {
		ret = -EINVAL;
		goto put_primary_if;
		}

		skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
		if (!skb_fragment) {
		ret = -ENOMEM;
		@@ -517,12 +523,6 @@ int batadv_frag_send_packet(struct sk_buff *skb,
		}

		frag_header.no++;

		/* The initial check in this function should cover this case */
		if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
		ret = -EINVAL;
		goto put_primary_if;
		}
		}

		/* Make room for the fragment header. */