]> www.infradead.org Git - users/jedix/linux-maple.git/commit
udp6: fix UDP/IPv6 encap resubmit path
authorBill Sommerfeld <wsommerfeld@google.com>
Fri, 4 Mar 2016 22:47:21 +0000 (14:47 -0800)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:00 +0000 (17:22 -0500)
commit5dc8ed79c1877d21c06f77b59b48513edbd5be2b
tree381a3979e4c317e3c04a8d90fd6951824922cecb
parent61bf6285c15a0eee9d3b2768988da1bbc9ab50a4
udp6: fix UDP/IPv6 encap resubmit path

Orabug: 25308049

[ Upstream commit 59dca1d8a6725a121dae6c452de0b2611d5865dc ]

IPv4 interprets a negative return value from a protocol handler as a
request to redispatch to a new protocol.  In contrast, IPv6 interprets a
negative value as an error, and interprets a positive value as a request
for redispatch.

UDP for IPv6 was unaware of this difference.  Change __udp6_lib_rcv() to
return a positive value for redispatch.  Note that the socket's
encap_rcv hook still needs to return a negative value to request
dispatch, and in the case of IPv6 packets, adjust IP6CB(skb)->nhoff to
identify the byte containing the next protocol.

Signed-off-by: Bill Sommerfeld <wsommerfeld@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 6def7a990b10af3532caed172e7ada9dbb596a53)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
net/ipv6/udp.c