releases/4.15.17/net-fool-proof-dev_valid_name.patch

   1 From foo@baz Tue Apr 10 23:19:36 CEST 2018
   2 From: Eric Dumazet <edumazet@google.com>
   3 Date: Thu, 5 Apr 2018 06:39:26 -0700
   4 Subject: net: fool proof dev_valid_name()
   5
   6 From: Eric Dumazet <edumazet@google.com>
   7
   8
   9 [ Upstream commit a9d48205d0aedda021fc3728972a9e9934c2b9de ]
  10
  11 We want to use dev_valid_name() to validate tunnel names,
  12 so better use strnlen(name, IFNAMSIZ) than strlen(name) to make
  13 sure to not upset KASAN.
  14
  15 Signed-off-by: Eric Dumazet <edumazet@google.com>
  16 Signed-off-by: David S. Miller <davem@davemloft.net>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  net/core/dev.c |    2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 --- a/net/core/dev.c
  23 +++ b/net/core/dev.c
  24 @@ -1027,7 +1027,7 @@ bool dev_valid_name(const char *name)
  25  {
  26         if (*name == '\0')
  27                 return false;
  28 -       if (strlen(name) >= IFNAMSIZ)
  29 +       if (strnlen(name, IFNAMSIZ) == IFNAMSIZ)
  30                 return false;
  31         if (!strcmp(name, ".") || !strcmp(name, ".."))
  32                 return false;