| From foo@baz Wed Apr 11 10:26:56 CEST 2018 |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Thu, 5 Apr 2018 06:39:26 -0700 |
| Subject: net: fool proof dev_valid_name() |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| |
| [ 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> |
| --- |
| net/core/dev.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -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; |
