diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-05-15 07:33:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 07:33:38 +0200 |
| commit | dcc997738e538919101d8756f19ca23110b25d8d (patch) | |
| tree | d0d190f28c94115c61afae0081248ceee51fd457 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
| download | linux-dcc997738e538919101d8756f19ca23110b25d8d.tar.xz linux-dcc997738e538919101d8756f19ca23110b25d8d.zip | |
net: handle errors from device_rename
device_rename can fail with -EEXIST or -ENOMEM, so handle any
problems.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a1607bc0cd4c..ce88c0d3e354 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -903,7 +903,11 @@ int dev_change_name(struct net_device *dev, char *newname) strlcpy(dev->name, newname, IFNAMSIZ); rollback: - device_rename(&dev->dev, dev->name); + err = device_rename(&dev->dev, dev->name); + if (err) { + memcpy(dev->name, oldname, IFNAMSIZ); + return err; + } write_lock_bh(&dev_base_lock); hlist_del(&dev->name_hlist); |