[CHERI] 65a219f0b Eliminate need for TRUST_ME()

Poul-Henning Kamp phk at FreeBSD.org
Tue Nov 29 12:48:11 UTC 2022


commit 65a219f0bbaa89497294e35407185b37f9e51cce
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 29 12:14:31 2022 +0000

    Eliminate need for TRUST_ME()

diff --git a/vmod/vmod_debug_acl.c b/vmod/vmod_debug_acl.c
index b7b772593..8f277e7a0 100644
--- a/vmod/vmod_debug_acl.c
+++ b/vmod/vmod_debug_acl.c
@@ -131,9 +131,12 @@ setup_sweep(VRT_CTX, struct acl_sweep *asw, VCL_IP ip0, VCL_IP ip1,
 	}
 	asw->this = asw->reset;
 
-	asw->probe = VSA_Clone(ip0);
+	/* Dont try this at home */
+	asw->probe = malloc(vsa_suckaddr_len);
+	AN(asw->probe);
+	memcpy(asw->probe, ip0, vsa_suckaddr_len);
 	(void)VSA_GetPtr(asw->probe, &ptr);
-	asw->probe_p = TRUST_ME(ptr);
+	asw->probe_p = ((uint8_t*)(asw->probe)) + (ptr - (uint8_t*)asw->probe);
 
 	asw->step = step;
 


More information about the varnish-commit mailing list