]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests: mptcp: fix incorrect fd checks in main_loop
authorCong Liu <liucong2@kylinos.cn>
Fri, 28 Mar 2025 14:27:17 +0000 (15:27 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 31 Mar 2025 23:52:39 +0000 (16:52 -0700)
Fix a bug where the code was checking the wrong file descriptors
when opening the input files. The code was checking 'fd' instead
of 'fd_in', which could lead to incorrect error handling.

Fixes: 05be5e273c84 ("selftests: mptcp: add disconnect tests")
Cc: stable@vger.kernel.org
Fixes: ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener")
Co-developed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Cong Liu <liucong2@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-2-34161a482a7f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_connect.c

index d240d02fa443a1cd802f0e705ab36db5c22063a8..893dc36b12f607bec56a41c9961eff272a7837c7 100644 (file)
@@ -1270,7 +1270,7 @@ int main_loop(void)
 
        if (cfg_input && cfg_sockopt_types.mptfo) {
                fd_in = open(cfg_input, O_RDONLY);
-               if (fd < 0)
+               if (fd_in < 0)
                        xerror("can't open %s:%d", cfg_input, errno);
        }
 
@@ -1293,7 +1293,7 @@ again:
 
        if (cfg_input && !cfg_sockopt_types.mptfo) {
                fd_in = open(cfg_input, O_RDONLY);
-               if (fd < 0)
+               if (fd_in < 0)
                        xerror("can't open %s:%d", cfg_input, errno);
        }