summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-07-19 23:33:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-11 18:33:56 +0300
commitf236da93df5be85409c24f03683e3d8c54fac72b (patch)
tree3d146a9619150d4202eb779907d8da2d56d9d487
parentc42851f218cc1a82494bd4263952f9b7a8673fcd (diff)
downloadlinux-f236da93df5be85409c24f03683e3d8c54fac72b.tar.xz
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>
-rw-r--r--net/core/dev_ioctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 434413f1074a..18f9cb9aa87d 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)