From 2bafdee791f2ba2cdf2a8034116511e0676afd7c Mon Sep 17 00:00:00 2001 From: Matheus Date: Tue, 4 Nov 2025 00:34:23 -0300 Subject: [PATCH] localsocket: fix issue with fd passing --- kernel-src/io/net/localsocket.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel-src/io/net/localsocket.c b/kernel-src/io/net/localsocket.c index acc889f6..c9e8bd21 100644 --- a/kernel-src/io/net/localsocket.c +++ b/kernel-src/io/net/localsocket.c @@ -237,9 +237,11 @@ static int sendctrl(socket_t *socket, sockctrl_t *ctrl, size_t len, size_t datas // create a new barrier secion __assert(peer->barrierwrite != peer->barriercurrent + BARRIER_SIZE); + if (peer->bytesremaining[peer->barrierwrite % BARRIER_SIZE]) + ++peer->barrierwrite; + peer->filesremaining[peer->barrierwrite % BARRIER_SIZE] = fdcount; peer->bytesremaining[peer->barrierwrite % BARRIER_SIZE] = datasent; - ++peer->barrierwrite; } ctrl = SOCK_CTRL_NEXT(ctrl); @@ -466,7 +468,8 @@ static int localsock_recv(socket_t *socket, sockdesc_t *sockdesc) { // check if we should step forward from that barrier localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] -= recvcount; - if (localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] == 0) + if (localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] == 0 && + localsocket->bytesremaining[(localsocket->barriercurrent + 1) % BARRIER_SIZE]) ++localsocket->barriercurrent; }