From fce22113ab84f9d2b42046f0f653249130ef3bad Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 19 Sep 2012 11:33:41 +0000
Subject: [PATCH] --- yaml --- r: 323091 b: refs/heads/master c:
 1f86840f897717f86d523a13e99a447e6a5d2fa5 h: refs/heads/master i:   323089:
 d1748874c08353c76de9ec91c031c90263d29990   323087:
 cf0a4c0b27b771fd12bb5857fca9c5294c5cb3cf v: v3

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

diff --git a/[refs] b/[refs]
index 0189a46573dd..d3063b86183f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b789836f434c87168eab067cfbed1ec4783dffd
+refs/heads/master: 1f86840f897717f86d523a13e99a447e6a5d2fa5
diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c
index 84dd85ceeeea..8024b3dea8c2 100644
--- a/trunk/net/xfrm/xfrm_user.c
+++ b/trunk/net/xfrm/xfrm_user.c
@@ -1425,6 +1425,7 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
 		struct xfrm_user_tmpl *up = &vec[i];
 		struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
 
+		memset(up, 0, sizeof(*up));
 		memcpy(&up->id, &kp->id, sizeof(up->id));
 		up->family = kp->encap_family;
 		memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr));