diff options
author | Paolo Abeni <pabeni@redhat.com> | 2018-10-17 11:44:04 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-18 07:26:53 +0200 |
commit | 84dad55951b0d009372ec21760b650634246e144 (patch) | |
tree | 2762dbbeef8ffd2fdde75889b5a77c277879afc2 /net | |
parent | mlxsw: core: Fix use-after-free when flashing firmware during init (diff) | |
download | linux-84dad55951b0d009372ec21760b650634246e144.tar.xz linux-84dad55951b0d009372ec21760b650634246e144.zip |
udp6: fix encap return code for resubmitting
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>
Diffstat (limited to 'net')
-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 28c4aa5078fc..b36694b6716e 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -766,11 +766,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; } |