From 3f3b3be65e2cc1edfdf474b4d426a0134485095f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 31 Jul 2007 02:04:32 -0700
Subject: [PATCH] --- yaml --- r: 63421 b: refs/heads/master c:
 196b003620f1ee8d0fc63f13f341187d63c1dc0a h: refs/heads/master i:   63419:
 7aef7724320e948d4e0e5c21fcf8256c228d05e2 v: v3

---
 [refs]                     | 2 +-
 trunk/net/xfrm/xfrm_user.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 997a9157e77a..8d2dde48231a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8ed601cefe7a4014b93560bd846caf44f25b1c1
+refs/heads/master: 196b003620f1ee8d0fc63f13f341187d63c1dc0a
diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c
index c06883bf620e..61339e17a0f5 100644
--- a/trunk/net/xfrm/xfrm_user.c
+++ b/trunk/net/xfrm/xfrm_user.c
@@ -322,6 +322,13 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
 	x->props.family = p->family;
 	memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
 	x->props.flags = p->flags;
+
+	/*
+	 * Set inner address family if the KM left it as zero.
+	 * See comment in validate_tmpl.
+	 */
+	if (!x->sel.family)
+		x->sel.family = p->family;
 }
 
 /*