Commit 0d1c057d authored Apr 05, 2018 by Eric Dumazet Committed by Greg Kroah-Hartman Apr 13, 2018

net: fool proof dev_valid_name()




[ Upstream commit a9d48205d0aedda021fc3728972a9e9934c2b9de ]

We want to use dev_valid_name() to validate tunnel names,
so better use strnlen(name, IFNAMSIZ) than strlen(name) to make
sure to not upset KASAN.

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

parent 359d6e35

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -993,7 +993,7 @@ bool dev_valid_name(const char *name)
		{
		if (*name == '\0')
		return false;
		if (strlen(name) >= IFNAMSIZ)
		if (strnlen(name, IFNAMSIZ) == IFNAMSIZ)
		return false;
		if (!strcmp(name, ".") \|\| !strcmp(name, ".."))
		return false;