X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Ftun.c;h=a12c9bffb1fa4e72711e5d2bd9a7d1021ee69f45;hb=79654e81bbd146017c8cd55aa9e88b668cf385e9;hp=7bea9c65119e339326155c45e4af6e268bda0c6c;hpb=4a1dba72384193753e44e15d9d05a50be6587271;p=pandora-kernel.git

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7bea9c65119e..a12c9bffb1fa 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1243,10 +1243,12 @@ 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?".
 		 * This is needed because we never checked for invalid flags on