]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests: mptcp: close server IPC descriptors
authorGeliang Tang <tanggeliang@kylinos.cn>
Fri, 12 Sep 2025 16:36:48 +0000 (18:36 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 16 Sep 2025 01:14:23 +0000 (18:14 -0700)
The client-side function connect_one_server() properly closes its IPC
descriptor after use, but the server-side code in both mptcp_sockopt.c
and mptcp_inq.c was missing corresponding close() calls for their IPC
descriptors, leaving file descriptors open unnecessarily.

This change ensures proper cleanup by:
1. Adding missing close(pipefds[0]/unixfds[0]) in server processes
2. Adding close(pipefds[1]/unixfds[1]) after server() function calls

This ensures both ends of the IPC pipe are properly closed in their
respective processes, preventing file descriptor leaks.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250912-net-next-mptcp-minor-fixes-6-18-v1-2-99d179b483ad@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_inq.c
tools/testing/selftests/net/mptcp/mptcp_sockopt.c

index 40f2a1b24763e3b84e12bfae7b893c35e6c2af71..8e8f6441ad8b0a79216eaf8f3b34c4ed2c2a1736 100644 (file)
@@ -581,8 +581,12 @@ int main(int argc, char *argv[])
                die_perror("pipe");
 
        s = xfork();
-       if (s == 0)
-               return server(unixfds[1]);
+       if (s == 0) {
+               close(unixfds[0]);
+               ret = server(unixfds[1]);
+               close(unixfds[1]);
+               return ret;
+       }
 
        close(unixfds[1]);
 
index b44b6c9b05507780fa85221e61813182cf7c082e..e9c359df941604b9d5eec17bb83d57afe1aa34fb 100644 (file)
@@ -848,8 +848,12 @@ int main(int argc, char *argv[])
                die_perror("pipe");
 
        s = xfork();
-       if (s == 0)
-               return server(pipefds[1]);
+       if (s == 0) {
+               close(pipefds[0]);
+               ret = server(pipefds[1]);
+               close(pipefds[1]);
+               return ret;
+       }
 
        close(pipefds[1]);