From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 13 Apr 2025 05:10:28 +0000 (+0900)
Subject: socket-proxy: fix use-after-free
X-Git-Tag: v258-rc1~827
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1f90d97fb1295247aed6bd1286ebcd42408c30;p=thirdparty%2Fsystemd.git

socket-proxy: fix use-after-free

Fixes a bug in 10e41cdddc45548cc5938a307a16711b47d68062.
Fixes CID#1609061.
---

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index a9ec68cda6c..fd23c608a09 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -131,10 +131,10 @@ static void context_reset_timer(Context *context) {
 }
 
 static void connection_release(Connection *c) {
-        assert(c);
+        Context *context = ASSERT_PTR(ASSERT_PTR(c)->context);
 
         connection_free(c);
-        context_reset_timer(c->context);
+        context_reset_timer(context);
 }
 
 static int connection_create_pipes(Connection *c, int buffer[static 2], size_t *sz) {