Commit 4a4b6271 authored Aug 02, 2007 by Joy Latten Committed by David S. Miller Aug 02, 2007

[PF_KEY]: Fix ipsec not working in 2.6.23-rc1-git10



Although an ipsec SA was established, kernel couldn't seem to find it.

I think since we are now using "x->sel.family" instead of "family" in
the xfrm_selector_match() called in xfrm_state_find(), af_key needs to
set this field too, just as xfrm_user.

In af_key.c, x->sel.family only gets set when there's an
ext_hdrs[SADB_EXT_ADDRESS_PROXY-1] which I think is for tunnel.

I think pfkey needs to also set the x->sel.family field when it is 0.

Tested with below patch, and ipsec worked when using pfkey.

Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3516ffb0

net/key/af_key.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1206,6 +1206,9 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
		}

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

		if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {
		struct sadb_x_nat_t_type* n_type;
		struct xfrm_encap_tmpl *natt;