mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
netdev: change name dropping error codes
If changename notifier returns an error code, it gets incorrectly cleared during rollback so the error is never returned to the user. Found while testing similar code for MTU changes. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0537ae6a3d
commit
92845ffd2a
1 changed files with 3 additions and 3 deletions
|
@ -924,10 +924,10 @@ int dev_change_name(struct net_device *dev, const char *newname)
|
|||
strlcpy(dev->name, newname, IFNAMSIZ);
|
||||
|
||||
rollback:
|
||||
err = device_rename(&dev->dev, dev->name);
|
||||
if (err) {
|
||||
ret = device_rename(&dev->dev, dev->name);
|
||||
if (ret) {
|
||||
memcpy(dev->name, oldname, IFNAMSIZ);
|
||||
return err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
write_lock_bh(&dev_base_lock);
|
||||
|
|
Loading…
Reference in a new issue