Browse Source

af_key: Fix selector family initialization.

This propagates the xfrm_user fix made in commit
bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 ("[XFRM]: xfrm_user: fix
selector family initialization")

Based upon a bug report from, and tested by, Alan Swanson.

Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Kazunori MIYAZAWA 17 years ago
parent
commit
4da5105687
1 changed files with 1 additions and 1 deletions
  1. 1 1
      net/key/af_key.c

+ 1 - 1
net/key/af_key.c

@@ -1251,7 +1251,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 	}
 	}
 
 
-	if (x->props.mode == XFRM_MODE_TRANSPORT)
+	if (!x->sel.family)
 		x->sel.family = x->props.family;
 		x->sel.family = x->props.family;
 
 
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {