From: Kazunori MIYAZAWA Date: Wed, 21 May 2008 20:26:11 +0000 (-0700) Subject: af_key: Fix selector family initialization. X-Git-Tag: v2.6.26-rc4~70^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4da5105687e0993a3bbdcffd89b2b94d9377faab;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- diff --git a/net/key/af_key.c b/net/key/af_key.c index 9e7236ff6bc..9bba7ac5fee 100644 --- a/net/key/af_key.c +++ b/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; } - if (x->props.mode == XFRM_MODE_TRANSPORT) + if (!x->sel.family) x->sel.family = x->props.family; if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {