shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

selftests: mptcp: close fd_in before returning in main_loop

Browse Source 
commit c183165f87a486d5879f782c05a23c179c3794ab upstream.

The file descriptor 'fd_in' is opened when cfg_input is configured, but
not closed in main_loop(), this patch fixes it.

Fixes: 05be5e273c ("selftests: mptcp: add disconnect tests")
Cc: stable@vger.kernel.org
Co-developed-by: Cong Liu <liucong2@kylinos.cn>
Signed-off-by: Cong Liu <liucong2@kylinos.cn>
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/20250328-net-mptcp-misc-fixes-6-15-v1-3-34161a482a7f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geliang Tang
2025-03-28 15:27:18 +01:00
committed by Greg Kroah-Hartman
parent 696198f89a
commit 47b445fc79
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/testing/selftests/net/mptcp/mptcp_connect.c
View File

@@ -1213,7 +1213,7 @@ again:
/* close the client socket open only if we are not going to reconnect */ /* close the client socket open only if we are not going to reconnect */
ret = copyfd_io(fd_in, fd, 1, 0); ret = copyfd_io(fd_in, fd, 1, 0);
if (ret) if (ret)
return ret; goto out;
if (cfg_truncate > 0) { if (cfg_truncate > 0) {
shutdown(fd, SHUT_WR); shutdown(fd, SHUT_WR);
@@ -1233,7 +1233,10 @@ again:
close(fd); close(fd);
} }
return 0; out:
if (cfg_input)
close(fd_in);
return ret;
} }
int parse_proto(const char *proto) int parse_proto(const char *proto)