---

yaml --- r: 323091 b: refs/heads/master c: 1f86840 h: refs/heads/master i: 323089: d174887 323087: cf0a4c0 v: v3
git-mirror · Sep 20, 2012 · fce2211 · fce2211
1 parent 31d0690
commit fce2211
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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));