Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a1dd4e authored by Li RongQing's avatar Li RongQing Committed by Greg Kroah-Hartman
Browse files

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: default avatarLi RongQing <lirongqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 318b0e84

net/core/dev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -6911,7 +6911,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 */

		/* We get here if we can't use the current device name */

		if (!pat)

		if (!pat)

			goto out;

			goto out;

		if (dev_get_valid_name(net, dev, pat) < 0)

		err = dev_get_valid_name(net, dev, pat);

		if (err < 0)

			goto out;

			goto out;

	}

	}
@@ -6923,7 +6924,6 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char 
	dev_close(dev);

	dev_close(dev);





	/* And unlink it from device chain */

	/* And unlink it from device chain */

	err = -ENODEV;

	unlist_netdevice(dev);

	unlist_netdevice(dev);





	synchronize_net();

	synchronize_net();