From 6b46117d2fa2d0103aea03e5ad64eb5fbe934efb Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 16 Aug 2012 03:14:04 +0000
Subject: [PATCH] --- yaml --- r: 327543 b: refs/heads/master c:
 5ef5d6c569f80cf716d75fa88e9b5ee72f0986b2 h: refs/heads/master i:   327541:
 6051662ade55f3398b284d95499a415850ebd181   327539:
 3be2284011535441afd2bf6ca56d1bf55154a15a   327535:
 ac3b273460ae3da905dca30bd7738be731884ec1 v: v3

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

diff --git a/[refs] b/[refs]
index 9eb96ab23525..f0190b64066f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56892261ed1a854db5363df8bb3fbdb2c6c28d4c
+refs/heads/master: 5ef5d6c569f80cf716d75fa88e9b5ee72f0986b2
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index 33d2a0e6712d..cb7e2ded6f08 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -1312,6 +1312,8 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 			}
 			ip6_tnl_parm_from_user(&p1, &p);
 			t = ip6_tnl_locate(net, &p1, 0);
+		} else {
+			memset(&p, 0, sizeof(p));
 		}
 		if (t == NULL)
 			t = netdev_priv(dev);