1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index c62163e272cd..926d4db5cb38 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1379,10 +1379,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