xfrm: Fix pmtu discovery for local generated packets.
authorSteffen Klassert <steffen.klassert@secunet.com>
Mon, 19 Oct 2015 08:30:05 +0000 (10:30 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Mon, 19 Oct 2015 08:30:05 +0000 (10:30 +0200)
commitca064bd89363a6e7e71b1c5226ff1b718957a9d4
tree4c40ed6e576810be7c1282e875cd132c422733f9
parent4e077237cfb6ab13701d504060d3ae248b191e6e
xfrm: Fix pmtu discovery for local generated packets.

Commit 044a832a777 ("xfrm: Fix local error reporting crash
with interfamily tunnels") moved the setting of skb->protocol
behind the last access of the inner mode family to fix an
interfamily crash. Unfortunately now skb->protocol might not
be set at all, so we fail dispatch to the inner address family.
As a reault, the local error handler is not called and the
mtu value is not reported back to userspace.

We fix this by setting skb->protocol on message size errors
before we call xfrm_local_error.

Fixes: 044a832a7779c ("xfrm: Fix local error reporting crash with interfamily tunnels")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/ipv4/xfrm4_output.c
net/ipv6/xfrm6_output.c