batman-adv: frag: free unfragmentable packet

The caller of batadv_frag_send_packet() assume that the skb provided to the
function are always consumed. But the pre-check for an empty payload or the
zero fragment size returned an error without any further actions.

A failed pre-check must use the same error handling code as the rest of the
function.

Cc: stable@vger.kernel.org
Fixes: ee75ed88879a ("batman-adv: Fragment and send skbs larger than mtu")
Signed-off-by: Sven Eckelmann <sven@narfation.org>

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 8a006a0473a87d77a79a38b11d0d06c364aebc3c..13d4689d332dc8fddceb965472fe8c9a2479079b 100644 (file)
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -518,8 +518,10 @@ int batadv_frag_send_packet(struct sk_buff *skb,
        mtu = min_t(unsigned int, mtu, BATADV_FRAG_MAX_FRAG_SIZE);
        max_fragment_size = mtu - header_size;
 
-       if (skb->len == 0 || max_fragment_size == 0)
-               return -EINVAL;
+       if (skb->len == 0 || max_fragment_size == 0) {
+               ret = -EINVAL;
+               goto free_skb;
+       }
 
        num_fragments = (skb->len - 1) / max_fragment_size + 1;
        max_fragment_size = (skb->len - 1) / num_fragments + 1;