Commit 91e9c07b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: Fix the rollback test in dev_change_name()

net: Fix the rollback test in dev_change_name()

In dev_change_name() an err variable is used for storing the original
call_netdevice_notifiers() errno (negative) and testing for a rollback
error later, but the test for non-zero is wrong, because the err might
have positive value as well - from dev_alloc_name(). It means the
rollback for a netdevice with a number > 0 will never happen. (The err
test is reordered btw. to make it more readable.)
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e29d4363
...@@ -942,14 +942,15 @@ int dev_change_name(struct net_device *dev, const char *newname) ...@@ -942,14 +942,15 @@ int dev_change_name(struct net_device *dev, const char *newname)
ret = notifier_to_errno(ret); ret = notifier_to_errno(ret);
if (ret) { if (ret) {
if (err) { /* err >= 0 after dev_alloc_name() or stores the first errno */
printk(KERN_ERR if (err >= 0) {
"%s: name change rollback failed: %d.\n",
dev->name, ret);
} else {
err = ret; err = ret;
memcpy(dev->name, oldname, IFNAMSIZ); memcpy(dev->name, oldname, IFNAMSIZ);
goto rollback; goto rollback;
} else {
printk(KERN_ERR
"%s: name change rollback failed: %d.\n",
dev->name, ret);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment