summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Jing <liujing@cmss.chinamobile.com>2024-07-27 11:04:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-11 12:58:03 +0200
commitfe2f8f5b2d70590e97514f0450e8c3a43cf2fc08 (patch)
tree54c6efb32c68d96674ac2dc8bf35f27f551ae930
parent9f7492e3b38d3007fd4003281fd9212fc823441f (diff)
selftests: mptcp: always close input's FD if opened
commit 7c70bcc2a84cf925f655ea1ac4b8088062b144a3 upstream. In main_loop_s function, when the open(cfg_input, O_RDONLY) function is run, the last fd is not closed if the "--cfg_repeat > 0" branch is not taken. Fixes: 05be5e273c84 ("selftests: mptcp: add disconnect tests") Cc: stable@vger.kernel.org Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/testing/selftests/net/mptcp/mptcp_connect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index d2043ec3bf6d..4209b9569039 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -1115,11 +1115,11 @@ again:
return 1;
}
- if (--cfg_repeat > 0) {
- if (cfg_input)
- close(fd);
+ if (cfg_input)
+ close(fd);
+
+ if (--cfg_repeat > 0)
goto again;
- }
return 0;
}