From cee5f2eed9c20f04eb498e3e7b322b132f3033c3 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 15 Aug 2012 11:31:56 +0000
Subject: [PATCH] --- yaml --- r: 322022 b: refs/heads/master c:
 2d8a041b7bfe1097af21441cb77d6af95f4f4680 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bc357aba8c86..a267cc982d21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b07f8eb75aa3097cdfd4f6eac3da49db787381d
+refs/heads/master: 2d8a041b7bfe1097af21441cb77d6af95f4f4680
diff --git a/trunk/net/netfilter/ipvs/ip_vs_ctl.c b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
index 84444dda194b..72bf32a84874 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2759,6 +2759,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
 	{
 		struct ip_vs_timeout_user t;
 
+		memset(&t, 0, sizeof(t));
 		__ip_vs_get_timeouts(net, &t);
 		if (copy_to_user(user, &t, sizeof(t)) != 0)
 			ret = -EFAULT;