diff options
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 3 | 
1 files changed, 1 insertions, 2 deletions
| diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index b976d9ed10e4..04c41504f84c 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -277,9 +277,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *  	memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));  	x->props.flags = p->flags; -	if (!x->sel.family) +	if (!x->sel.family && !(p->flags & XFRM_STATE_AF_UNSPEC))  		x->sel.family = p->family; -  }  /* | 
