tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Kazunori MIYAZAWA and committed by David S. Miller 4da51056 d8ac48d4

+1 -1
unified split
+1 -1
net/key/af_key.c
··· 1251 x->sel.prefixlen_s = addr->sadb_address_prefixlen; 1252 } 1253 1254 - if (x->props.mode == XFRM_MODE_TRANSPORT) 1255 x->sel.family = x->props.family; 1256 1257 if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {
··· 1251 x->sel.prefixlen_s = addr->sadb_address_prefixlen; 1252 } 1253 1254 + if (!x->sel.family) 1255 x->sel.family = x->props.family; 1256 1257 if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {