Commit 189771d6 authored Oct 17, 2018 by Paolo Abeni Committed by Greg Kroah-Hartman Nov 04, 2018

udp6: fix encap return code for resubmitting



[ Upstream commit 84dad55951b0d009372ec21760b650634246e144 ]

The commit eb63f2964dbe ("udp6: add missing checks on edumux packet
processing") used the same return code convention of the ipv4 counterpart,
but ipv6 uses the opposite one: positive values means resubmit.

This change addresses the issue, using positive return value for
resubmitting. Also update the related comment, which was broken, too.

Fixes: eb63f2964dbe ("udp6: add missing checks on edumux packet processing")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 606694e5

net/ipv6/udp.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -794,11 +794,9 @@ static int udp6_unicast_rcv_skb(struct sock sk, struct sk_buff skb,

		ret = udpv6_queue_rcv_skb(sk, skb);

		/* a return value > 0 means to resubmit the input, but
		* it wants the return to be -protocol, or 0
		*/
		/* a return value > 0 means to resubmit the input */
		if (ret > 0)
		return -ret;
		return ret;
		return 0;
		}