From: Alexander Potapenko <glider@google.com>
Date: Tue, 6 Jun 2017 13:56:54 +0000 (+0200)
Subject: net: don't call strlen on non-terminated string in dev_set_alias()
X-Git-Tag: v4.9.36~170
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d2f459e3feb0f73d2e95ab7892adcf22f21fe9ef;p=users%2Fdwmw2%2Flinux.git

net: don't call strlen on non-terminated string in dev_set_alias()


[ Upstream commit c28294b941232931fbd714099798eb7aa7e865d7 ]

KMSAN reported a use of uninitialized memory in dev_set_alias(),
which was caused by calling strlcpy() (which in turn called strlen())
on the user-supplied non-terminated string.

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

diff --git a/net/core/dev.c b/net/core/dev.c
index 2e04fd1880816..97f806116ae90 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1250,8 +1250,9 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)
 	if (!new_ifalias)
 		return -ENOMEM;
 	dev->ifalias = new_ifalias;
+	memcpy(dev->ifalias, alias, len);
+	dev->ifalias[len] = 0;
 
-	strlcpy(dev->ifalias, alias, len+1);
 	return len;
 }