]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests: mptcp: close fd_in before returning in main_loop
authorGeliang Tang <tanggeliang@kylinos.cn>
Fri, 28 Mar 2025 14:27:18 +0000 (15:27 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 31 Mar 2025 23:52:39 +0000 (16:52 -0700)
The file descriptor 'fd_in' is opened when cfg_input is configured, but
not closed in main_loop(), this patch fixes it.

Fixes: 05be5e273c84 ("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>
tools/testing/selftests/net/mptcp/mptcp_connect.c

index 893dc36b12f607bec56a41c9961eff272a7837c7..c83a8b47bbdfa5fcf1462e2b2949b41fd32c9b14 100644 (file)
@@ -1299,7 +1299,7 @@ again:
 
        ret = copyfd_io(fd_in, fd, 1, 0, &winfo);
        if (ret)
-               return ret;
+               goto out;
 
        if (cfg_truncate > 0) {
                shutdown(fd, SHUT_WR);
@@ -1320,7 +1320,10 @@ again:
                close(fd);
        }
 
-       return 0;
+out:
+       if (cfg_input)
+               close(fd_in);
+       return ret;
 }
 
 int parse_proto(const char *proto)