From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Jul 2017 20:33:24 +0000 (-0700)
Subject: net: Zero terminate ifr_name in dev_ifname().
X-Git-Tag: v4.12.6~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f236da93df5be85409c24f03683e3d8c54fac72b;p=thirdparty%2Fkernel%2Fstable.git

net: Zero terminate ifr_name in dev_ifname().


[ Upstream commit 63679112c536289826fec61c917621de95ba2ade ]

The ifr.ifr_name is passed around and assumed to be NULL terminated.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 434413f1074a7..18f9cb9aa87d4 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -28,6 +28,7 @@ static int dev_ifname(struct net *net, struct ifreq __user *arg)
 
 	if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
 		return -EFAULT;
+	ifr.ifr_name[IFNAMSIZ-1] = 0;
 
 	error = netdev_get_name(net, ifr.ifr_name, ifr.ifr_ifindex);
 	if (error)