veth: Fix problems removing veth devices

[sliver-openvswitch.git] / datapath / linux-2.6 / compat-2.6 / veth.c

diff --git a/datapath/linux-2.6/compat-2.6/veth.c b/datapath/linux-2.6/compat-2.6/veth.c
index e609c62..66aae0b 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/veth.c
+++ b/datapath/linux-2.6/compat-2.6/veth.c
@@ -454,10 +454,13 @@ static ssize_t veth_store_veth_pairs(struct class *cls, const char *buffer,
                rtnl_unlock();
                return retval ? retval : count;
        } else if (c == '-') {
+               char devname[IFNAMSIZ + 1] = "";
                struct net_device *dev;
 
+               strncat(devname, buffer,
+                       min_t(int, sizeof devname, strcspn(buffer, "\n")));
                rtnl_lock();
-               dev = dev_get_by_name(buffer);
+               dev = __dev_get_by_name(devname);
                if (!dev)
                        retval = -ENODEV;
                else if (dev->init != veth_dev_init)