diff options
author | Paolo Abeni <pabeni@redhat.com> | 2018-10-17 11:44:04 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-04 14:52:49 +0100 |
commit | 189771d69e14404b0e6eb57aa40bed2a95f7e2c2 (patch) | |
tree | 3186ced66585b45a5bcbcda45b5f8538bf5257af | |
parent | 606694e5ec81d598c0300f9e16db0464659df557 (diff) | |
download | linux-stable-189771d69e14404b0e6eb57aa40bed2a95f7e2c2.tar.gz linux-stable-189771d69e14404b0e6eb57aa40bed2a95f7e2c2.tar.bz2 linux-stable-189771d69e14404b0e6eb57aa40bed2a95f7e2c2.zip |
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>
-rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 5cee941ab0a9..8d185a0fc5af 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -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; } |