diff options
| author | Kazunori MIYAZAWA <kazunori@miyazawa.org> | 2008-05-21 22:26:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-21 22:26:11 +0200 |
| commit | 4da5105687e0993a3bbdcffd89b2b94d9377faab (patch) | |
| tree | bd6a67ec275f11f633224aa683e4102437a2d646 /net | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| download | linux-4da5105687e0993a3bbdcffd89b2b94d9377faab.tar.xz linux-4da5105687e0993a3bbdcffd89b2b94d9377faab.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 9e7236ff6bcc..9bba7ac5fee0 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]) { |