From 16f134bb58633ff89ea5529f61367059f10e61a1 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 9 Aug 2019 17:08:04 -0700 Subject: [PATCH] Fix a race condition in the bridge plugin. Signed-off-by: Lantao Liu --- plugins/main/bridge/bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 63e0d89a..7ed5d92b 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -170,7 +170,7 @@ func ensureBridgeAddr(br *netlink.Bridge, family int, ipn *net.IPNet, forceAddre } 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.Name, err) }