]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 08:43:46 +0000 (10:43 +0200)
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/testing/selftests/net/mptcp/mptcp_connect.c

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