network: don't delete net devs we didn't create

When we didn't create a net dev we should make sure that we don't delete it.  We
can simply check whether we have index for it. If not, we didn't create it.

Closes #1600.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 85805f975dde6725f26f7632e223509e9774d2a0..b65c4add844b543010b2e2f458b3870da364180c 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2873,7 +2873,8 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
        return 0;
 
 out_delete:
-       lxc_netdev_delete_by_name(veth1);
+       if (netdev->ifindex != 0)
+               lxc_netdev_delete_by_name(veth1);
        if (!netdev->priv.veth_attr.pair)
                free(veth1);
        free(veth2);
@@ -3201,7 +3202,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
                /* Explicitly delete host veth device to prevent lingering
                 * devices. We had issues in LXD around this.
                 */
-               if (netdev->type == LXC_NET_VETH && !am_unpriv()) {
+               if (netdev->ifindex != 0 && netdev->type == LXC_NET_VETH && !am_unpriv()) {
                        char *hostveth;
                        if (netdev->priv.veth_attr.pair) {
                                hostveth = netdev->priv.veth_attr.pair;