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

Commit 7892bd08 authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files

net: propagate dev_get_valid_name return code 



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>
parent 56f77227

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -8643,7 +8643,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;

	}
@@ -8655,7 +8656,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();