| Message ID | 20240702040518.11058-1-liujing@cmss.chinamobile.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] selftests: mptcp: always close input's FD if opened | expand |
Hi Liu, On 02/07/2024 06:05, Liu Jing wrote: > in main_loop_s function, when the open(cfg_input, O_RDONLY) function is run, Please see my previous message: the commit description should have lines of maximum ~72 chars. > the last fd is not closed if the "--cfg_repeat > 0" branch is not taken. > > Fixes: 05be5e273c84("selftests: mptcp: add disconnect tests"). There should be a space after the commit ID, not dot at the end, and no blank line between git tags ("Fixes:", "Signed-off-by", etc.). > > Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com> > --- > Changes from v1 > - add close function in main_loop_s function It looks like you didn't change the code as I suggested: moving... if (cfg_input) close(fd); before 'if (--cfg_repeat > 0)'. Anyway, I just applied your patch in our tree (fixes for -net) with all the modifications mentioned above. We will send it to netdev later with other patches. New patches for t/upstream-net and t/upstream: - d2657c3f784a: selftests: mptcp: always close input's FD if opened - Results: a9e719ce2340..fa4c0289d475 (export-net) - Results: b49e920db095..dcc28bf9bc6a (export) Tests are now in progress: - export-net: https://github.com/multipath-tcp/mptcp_net-next/commit/fa397dbd31963500c42d31a4892e0b9c7e4c9ff9/checks - export: https://github.com/multipath-tcp/mptcp_net-next/commit/ff673f57b4479a78dd9eb18af3c8c0fe73bf958b/checks Cheers, Matt
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index d2043ec3bf6d..48b7389ae75b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -1119,7 +1119,8 @@ int main_loop_s(int listensock) if (cfg_input) close(fd); goto again; - } + } else + close(fd); return 0; }
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"). Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com> --- Changes from v1 - add close function in main_loop_s function --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)