diff options
author | Li RongQing <lirongqing@baidu.com> | 2018-06-19 17:23:17 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-24 13:09:02 +0200 |
commit | e0eaae3872840ab8b57457da9b2a82551136168d (patch) | |
tree | 19e1750815cc138df0fdf6391cbab2c39e95d96a /net | |
parent | 7c828ea375a19f84f3f1c0546adc05766102aa6f (diff) | |
download | linux-stable-e0eaae3872840ab8b57457da9b2a82551136168d.tar.gz linux-stable-e0eaae3872840ab8b57457da9b2a82551136168d.tar.bz2 linux-stable-e0eaae3872840ab8b57457da9b2a82551136168d.zip |
net: propagate dev_get_valid_name return code
[ Upstream commit 7892bd081045222b9e4027fec279a28d6fe7aa66 ]
if dev_get_valid_name failed, propagate its return code
and remove the setting err to ENODEV, it will be set to
0 again before dev_change_net_namespace exits.
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6ca771f2f25b..85f4a1047707 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8297,7 +8297,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char /* We get here if we can't use the current device name */ if (!pat) goto out; - if (dev_get_valid_name(net, dev, pat) < 0) + err = dev_get_valid_name(net, dev, pat); + if (err < 0) goto out; } @@ -8309,7 +8310,6 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char dev_close(dev); /* And unlink it from device chain */ - err = -ENODEV; unlist_netdevice(dev); synchronize_net(); |