regexp.QuoteMate special devices and simplify the final regexp

Co-authored-by: Shaun Crampton <[email protected]>
projectcalico · Nov 22, 2024 · 096dfcd · 096dfcd
1 parent e37d9ac
commit 096dfcd
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/felix/dataplane/linux/bpf_ep_mgr.go b/felix/dataplane/linux/bpf_ep_mgr.go
@@ -550,12 +550,11 @@ func newBPFEndpointManager(
 		specialInterfaces = append(specialInterfaces, config.RulesConfig.WireguardInterfaceNameV6)
 	}
 
-	exp := "(" + config.BPFDataIfacePattern.String() + ")|("
-	for _, d := range specialInterfaces {
-		exp += "^" + d + "$|"
+	for i, d := range specialInterfaces {
+		specialInterfaces[i] = "^" + regexp.QuoteMeta(d) + "$"
 	}
+	exp := "(" + config.BPFDataIfacePattern.String() + "|" + strings.Join(specialInterfaces, "|") + ")"
 
-	exp = exp[:len(exp)-1] + ")"
 	log.WithField("dataIfaceRegex", exp).Debug("final dataIfaceRegex")
 	m.dataIfaceRegex = regexp.MustCompile(exp)