Merge pull request #1791 from Blub/unnamed-vs-ovs-bridge

network: add missing checks for empty links

Merge pull request #1791 from Blub/unnamed-vs-ovs-bridge
dc647c58 · Christian Brauner · GitHub · e8f614f2 · c869be20 · dc647c58
Commit dc647c58 authored Sep 06, 2017 by Christian Brauner Committed by GitHub Sep 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

network.c src/lxc/network.c +2 -2

No files found.
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -2350,7 +2350,7 @@ bool lxc_delete_network_unpriv(struct lxc_handler *handler)
 		if (netdev->type != LXC_NET_VETH)
 			continue;

-		if (!is_ovs_bridge(netdev->link))
+		if (netdev->link[0] == '\0' || !is_ovs_bridge(netdev->link))
 			continue;

 		if (netdev->priv.veth_attr.pair[0] != '\0')
@@ -2559,7 +2559,7 @@ bool lxc_delete_network_priv(struct lxc_handler *handler)
 		}
 		INFO("Removed interface \"%s\" from \"%s\"", hostveth, netdev->link);

-		if (!is_ovs_bridge(netdev->link)) {
+		if (netdev->link[0] == '\0' || !is_ovs_bridge(netdev->link)) {
 			netdev->priv.veth_attr.veth1[0] = '\0';
 			continue;
 		}