Fix a race condition in the bridge plugin.

Signed-off-by: Lantao Liu <lantaol@google.com>
containernetworking · Aug 10, 2019 · ad7c1d1 · ad7c1d1
1 parent ccd683e
commit ad7c1d1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go
@@ -175,7 +175,7 @@ func ensureAddr(br netlink.Link, family int, ipn *net.IPNet, forceAddress bool)
 	}
 
 	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err := netlink.AddrAdd(br, addr); err != nil {
+	if err := netlink.AddrAdd(br, addr); err != nil && err != syscall.EEXIST {
 		return fmt.Errorf("could not add IP address to %q: %v", br.Attrs().Name, err)
 	}