From 496a0c3c418adf5411648203d2288b0b23631cc1 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Sun, 29 Jul 2012 19:45:14 +0000
Subject: [PATCH] --- yaml --- r: 320520 b: refs/heads/master c:
 a117dacde0288f3ec60b6e5bcedae8fa37ee0dfc h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 023937570f78..560af8d56fb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac83e53917ebc058066eb98023c11fdaa2262dc
+refs/heads/master: a117dacde0288f3ec60b6e5bcedae8fa37ee0dfc
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index c62163e272cd..f55c46222613 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1379,9 +1379,11 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 	int vnet_hdr_sz;
 	int ret;
 
-	if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
+	if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
 		if (copy_from_user(&ifr, argp, ifreq_len))
 			return -EFAULT;
+	} else
+		memset(&ifr, 0, sizeof(ifr));
 
 	if (cmd == TUNGETFEATURES) {
 		/* Currently this just means: "what IFF flags are valid?".