From 5707c3e4f82e2bed370091247ddd0f38ae452d5b Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Sun, 12 May 2024 17:30:30 -0600 Subject: [PATCH] Change how the listeners are parented to avoid tripping up mprotect --- src/lib/io/master.c | 2 +- src/lib/io/network.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/io/master.c b/src/lib/io/master.c index 8432e7dc4c..42d6cc30c9 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -2932,7 +2932,7 @@ int fr_master_io_listen(TALLOC_CTX *ctx, fr_io_instance_t *inst, fr_schedule_t * * path data takes from the socket to the decoder and * back again. */ - MEM(li = talloc_zero(ctx, fr_listen_t)); + MEM(li = talloc_zero(NULL, fr_listen_t)); talloc_set_destructor(li, fr_io_listen_free); /* diff --git a/src/lib/io/network.c b/src/lib/io/network.c index ec96321c80..30ad5a01c7 100644 --- a/src/lib/io/network.c +++ b/src/lib/io/network.c @@ -1335,6 +1335,7 @@ static int fr_network_listen_add_self(fr_network_t *nr, fr_listen_t *li) s = talloc_zero(nr, fr_network_socket_t); fr_assert(s != NULL); + talloc_steal(s, li); s->nr = nr; s->listen = li; -- 2.47.3