From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 12 May 2024 23:30:30 +0000 (-0600)
Subject: Change how the listeners are parented to avoid tripping up mprotect
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5707c3e4f82e2bed370091247ddd0f38ae452d5b;p=thirdparty%2Ffreeradius-server.git

Change how the listeners are parented to avoid tripping up mprotect
---

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 8432e7dc4ca..42d6cc30c91 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 ec96321c80a..30ad5a01c72 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;