mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
Merge 47b445fc79 ("selftests: mptcp: close fd_in before returning in main_loop") into android14-6.1-lts
Steps on the way to 6.1.135 Change-Id: I39412aa8b1a6ac855b255be42f5663073e960b65 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user