Messages in this thread Patch in this message | | | Date | Fri, 13 Jun 2008 17:10:52 -0700 | From | Greg KH <> | Subject | [patch 14/47] af_key: Fix selector family initialization. |
| |
-stable review patch. If anyone has any objections, please let us know.
------------------ From: Kazunori MIYAZAWA <kazunori@miyazawa.org>
[ upstream commit: 4da5105687e0993a3bbdcffd89b2b94d9377faab ]
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> Signed-off-by: Chris Wright <chrisw@sous-sol.org> --- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1219,7 +1219,7 @@ static struct xfrm_state * pfkey_msg2xfr 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]) { --
| |