diff options
| author | Joy Latten <latten@austin.ibm.com> | 2007-08-02 19:25:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-02 19:42:29 -0700 |
| commit | 4a4b6271a8df417e328aed4c8a7e04e0b282207e (patch) | |
| tree | a1080744f58a4aa0864453f989966b2df64df41c | |
| parent | 3516ffb0fef710749daf288c0fe146503e0cf9d4 (diff) | |
| download | op-kernel-dev-4a4b6271a8df417e328aed4c8a7e04e0b282207e.zip op-kernel-dev-4a4b6271a8df417e328aed4c8a7e04e0b282207e.tar.gz | |
[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>
| -rw-r--r-- | net/key/af_key.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 7b0a95a..5502df1 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -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; |
