Skip to content

L
lxc
Unverified Commit 08a46538 by Christian Brauner Committed by Stéphane Graber
Options

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: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 01b4373b
Showing with 3 additions and 2 deletions
src/lxc/conf.c
......@@ -2775,7 +2775,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);
......@@ -3103,7 +3104,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;
......
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