Commit bcf0dda8 authored Apr 09, 2008 by Patrick McHardy Committed by David S. Miller Apr 09, 2008

[XFRM]: xfrm_user: fix selector family initialization



Commit df9dcb45 ([IPSEC]: Fix inter address family IPsec tunnel handling)
broke openswan by removing the selector initialization for tunnel mode
in case it is uninitialized.

This patch restores the initialization, fixing openswan, but probably
breaking inter-family tunnels again (unknown since the patch author
disappeared). The correct thing for inter-family tunnels is probably
to simply initialize the selector family explicitly.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 21f644f3

net/xfrm/xfrm_user.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ static void copy_from_user_state(struct xfrm_state x, struct xfrm_usersa_info
		memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
		x->props.flags = p->flags;

		if (x->props.mode == XFRM_MODE_TRANSPORT)
		if (!x->sel.family)
		x->sel.family = p->family;

		}

Admin message