xfrm: Allow different selector family in temporary state
authorThomas Egerer <thomas.egerer@secunet.com>
Mon, 20 Sep 2010 18:11:38 +0000 (11:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Sep 2010 18:11:38 +0000 (11:11 -0700)
commit8444cf712c5f71845cba9dc30d8f530ff0d5ff83
tree3283983551829eb3f985a92d49ec65ac8e487268
parent842c74bffcdb1d305ccd9e61e417cceae86b9963
xfrm: Allow different selector family in temporary state

The family parameter xfrm_state_find is used to find a state matching a
certain policy. This value is set to the template's family
(encap_family) right before xfrm_state_find is called.
The family parameter is however also used to construct a temporary state
in xfrm_state_find itself which is wrong for inter-family scenarios
because it produces a selector for the wrong family. Since this selector
is included in the xfrm_user_acquire structure, user space programs
misinterpret IPv6 addresses as IPv4 and vice versa.
This patch splits up the original init_tempsel function into a part that
initializes the selector respectively the props and id of the temporary
state, to allow for differing ip address families whithin the state.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/xfrm.h
net/ipv4/xfrm4_state.c
net/ipv6/xfrm6_state.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c