queue-4.4/net-propagate-dev_get_valid_name-return-code.patch

   1 From foo@baz Wed Aug 22 10:28:26 CEST 2018
   2 From: Li RongQing <lirongqing@baidu.com>
   3 Date: Tue, 19 Jun 2018 17:23:17 +0800
   4 Subject: net: propagate dev_get_valid_name return code
   5
   6 From: Li RongQing <lirongqing@baidu.com>
   7
   8 [ Upstream commit 7892bd081045222b9e4027fec279a28d6fe7aa66 ]
   9
  10 if dev_get_valid_name failed, propagate its return code
  11
  12 and remove the setting err to ENODEV, it will be set to
  13 0 again before dev_change_net_namespace exits.
  14
  15 Signed-off-by: Li RongQing <lirongqing@baidu.com>
  16 Signed-off-by: David S. Miller <davem@davemloft.net>
  17 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  net/core/dev.c |    4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 --- a/net/core/dev.c
  24 +++ b/net/core/dev.c
  25 @@ -7420,7 +7420,8 @@ int dev_change_net_namespace(struct net_
  26                 /* We get here if we can't use the current device name */
  27                 if (!pat)
  28                         goto out;
  29 -               if (dev_get_valid_name(net, dev, pat) < 0)
  30 +               err = dev_get_valid_name(net, dev, pat);
  31 +               if (err < 0)
  32                         goto out;
  33         }
  34
  35 @@ -7432,7 +7433,6 @@ int dev_change_net_namespace(struct net_
  36         dev_close(dev);
  37
  38         /* And unlink it from device chain */
  39 -       err = -ENODEV;
  40         unlist_netdevice(dev);
  41
  42         synchronize_net();