diff options
author | Eric Dumazet <edumazet@google.com> | 2018-04-05 16:39:26 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-13 20:52:24 +0300 |
commit | f377efac04e88a9fcfe1332c7d590398cf320553 (patch) | |
tree | 0f4e3109d8f98a25d1a9096a34698fe612ded575 /net/core | |
parent | 8666081f2b185994e799f8c3abb655749b46db61 (diff) | |
download | linux-f377efac04e88a9fcfe1332c7d590398cf320553.tar.xz |
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>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fd8894b8621d..8bd1e4973d8f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -937,7 +937,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; |