xfrm: make local error reporting more robust
authorHannes Frederic Sowa <hannes@stressinduktion.org>
Wed, 14 Aug 2013 11:05:23 +0000 (13:05 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Wed, 14 Aug 2013 11:07:12 +0000 (13:07 +0200)
commit628e341f319f1a64a4639088faba952e4ec8f0a8
tree28fd4b1a02ca00a1abe0b1e71898ab8db6a81dad
parentd9bf5f130946695063469749bfd190087b7fad39
xfrm: make local error reporting more robust

In xfrm4 and xfrm6 we need to take care about sockets of the other
address family. This could happen because a 6in4 or 4in6 tunnel could
get protected by ipsec.

Because we don't want to have a run-time dependency on ipv6 when only
using ipv4 xfrm we have to embed a pointer to the correct local_error
function in xfrm_state_afinet and look it up when returning an error
depending on the socket address family.

Thanks to vi0ss for the great bug report:
<https://bugzilla.kernel.org/show_bug.cgi?id=58691>

v2:
a) fix two more unsafe interpretations of skb->sk as ipv6 socket
   (xfrm6_local_dontfrag and __xfrm6_output)
v3:
a) add an EXPORT_SYMBOL_GPL(xfrm_local_error) to fix a link error when
   building ipv6 as a module (thanks to Steffen Klassert)

Reported-by: <vi0oss@gmail.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
include/net/xfrm.h
net/ipv4/xfrm4_output.c
net/ipv4/xfrm4_state.c
net/ipv6/xfrm6_output.c
net/ipv6/xfrm6_state.c
net/xfrm/xfrm_output.c
net/xfrm/xfrm_state.c