fix: must_rules causes match_set modification

daeuniverse · Dec 23, 2024 · 7e91fee · 7e91fee
1 parent d9101f4
commit 7e91fee
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/control/kern/tproxy.c b/control/kern/tproxy.c
@@ -829,15 +829,14 @@ static int route_loop_cb(__u32 index, void *data)
 				     OUTBOUND_MUST_RULES)) {
 				ctx->isdns_must_goodsubrule_badrule |= 0b100;
 			} else {
-				if (ctx->isdns_must_goodsubrule_badrule & 0b100)
-					match_set->must = true;
-				if (!match_set->must &&
+				bool must = ctx->isdns_must_goodsubrule_badrule & 0b100 || match_set->must;
+				if (!must &&
 				    (ctx->isdns_must_goodsubrule_badrule &
 				     0b1000)) {
 					ctx->result =
 						(__s64)OUTBOUND_CONTROL_PLANE_ROUTING |
 						((__s64)match_set->mark << 8) |
-						((__s64)match_set->must << 40);
+						((__s64)must << 40);
 #ifdef __DEBUG_ROUTING
 					bpf_printk(
 						"OUTBOUND_CONTROL_PLANE_ROUTING: %ld",
@@ -847,7 +846,7 @@ static int route_loop_cb(__u32 index, void *data)
 				}
 				ctx->result = (__s64)match_set->outbound |
 					      ((__s64)match_set->mark << 8) |
-					      ((__s64)match_set->must << 40);
+					      ((__s64)must << 40);
 #ifdef __DEBUG_ROUTING
 				bpf_printk("outbound %u: %ld",
 					   match_set->outbound, ctx->result);