From 1f2197b64f7c734ae4d925a147dd64b0c0ddcecf Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 8 Jun 2020 10:32:28 +0200 Subject: [PATCH 1/4] socket_wrapper.c: implement getsockopt(TCP_INFO) if the platform supports it This just implements a few basics, which are required by Samba. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11897 Signed-off-by: Stefan Metzmacher (cherry picked from commit 300de6e099ea82ee5361918de8c3abb389e0782d) --- ConfigureChecks.cmake | 1 + config.h.cmake | 1 + src/socket_wrapper.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 4d5adc4..4a2f55e 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -43,6 +43,7 @@ int main(void){ return 0; } endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2) # HEADERS +check_include_file(netinet/tcp_fsm.h HAVE_NETINET_TCP_FSM_H) check_include_file(sys/filio.h HAVE_SYS_FILIO_H) check_include_file(sys/signalfd.h HAVE_SYS_SIGNALFD_H) check_include_file(sys/eventfd.h HAVE_SYS_EVENTFD_H) diff --git a/config.h.cmake b/config.h.cmake index 36050b5..d3ceb23 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -9,6 +9,7 @@ /************************** HEADER FILES *************************/ +#cmakedefine HAVE_NETINET_TCP_FSM_H 1 #cmakedefine HAVE_SYS_FILIO_H 1 #cmakedefine HAVE_SYS_SIGNALFD_H 1 #cmakedefine HAVE_SYS_EVENTFD_H 1 diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 5b7c9ea..4fb7b23 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -66,6 +66,9 @@ #include #include #include +#ifdef HAVE_NETINET_TCP_FSM_H +#include +#endif #include #include #include @@ -264,6 +267,7 @@ struct socket_info int defer_connect; int pktinfo; int tcp_nodelay; + int listening; /* The unix path so we can unlink it on close() */ struct sockaddr_un un_addr; @@ -4097,6 +4101,9 @@ static int swrap_listen(int s, int backlog) } ret = libc_listen(s, backlog); + if (ret == 0) { + si->listening = 1; + } out: SWRAP_UNLOCK_SI(si); @@ -4446,6 +4453,56 @@ static int swrap_getsockopt(int s, int level, int optname, ret = 0; goto done; #endif /* TCP_NODELAY */ +#ifdef TCP_INFO + case TCP_INFO: { + struct tcp_info info; + socklen_t ilen = sizeof(info); + +#ifdef HAVE_NETINET_TCP_FSM_H +/* This is FreeBSD */ +# define __TCP_LISTEN TCPS_LISTEN +# define __TCP_ESTABLISHED TCPS_ESTABLISHED +# define __TCP_CLOSE TCPS_CLOSED +#else +/* This is Linux */ +# define __TCP_LISTEN TCP_LISTEN +# define __TCP_ESTABLISHED TCP_ESTABLISHED +# define __TCP_CLOSE TCP_CLOSE +#endif + + ZERO_STRUCT(info); + if (si->listening) { + info.tcpi_state = __TCP_LISTEN; + } else if (si->connected) { + /* + * For now we just fake a few values + * supported both by FreeBSD and Linux + */ + info.tcpi_state = __TCP_ESTABLISHED; + info.tcpi_rto = 200000; /* 200 msec */ + info.tcpi_rtt = 5000; /* 5 msec */ + info.tcpi_rttvar = 5000; /* 5 msec */ + } else { + info.tcpi_state = __TCP_CLOSE; + info.tcpi_rto = 1000000; /* 1 sec */ + info.tcpi_rtt = 0; + info.tcpi_rttvar = 250000; /* 250 msec */ + } + + if (optval == NULL || optlen == NULL || + *optlen < (socklen_t)ilen) { + errno = EINVAL; + ret = -1; + goto done; + } + + *optlen = ilen; + memcpy(optval, &info, ilen); + + ret = 0; + goto done; + } +#endif /* TCP_INFO */ default: break; } -- GitLab From 9edbf3d47151e8122af3d074fa58bec1a990852c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 19 Jun 2020 20:52:23 +0200 Subject: [PATCH 2/4] test_echo_tcp_socket_options.c: add tests for TCP_INFO Signed-off-by: Stefan Metzmacher (cherry picked from commit a37c0175492fb1b35257b785c71dea4e4f6d4750) --- tests/echo_srv.c | 32 ++++++++++++++++++ tests/test_echo_tcp_socket_options.c | 50 ++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/tests/echo_srv.c b/tests/echo_srv.c index 93778f2..87c85f7 100644 --- a/tests/echo_srv.c +++ b/tests/echo_srv.c @@ -9,6 +9,10 @@ #include #include +#include +#ifdef HAVE_NETINET_TCP_FSM_H +#include +#endif #include #include @@ -315,6 +319,34 @@ static int setup_srv(struct echo_srv_opts *opts, int *_sock) perror("listen"); return ret; } +#ifdef TCP_INFO + { + struct tcp_info info; + socklen_t optlen = sizeof(info); + + ZERO_STRUCT(info); + ret = getsockopt(sock, IPPROTO_TCP, TCP_INFO, &info, &optlen); + if (ret == -1) { + ret = errno; + perror("TCP_INFO failed"); + close(sock); + return ret; + } +#ifdef HAVE_NETINET_TCP_FSM_H +/* This is FreeBSD */ +# define __TCP_LISTEN TCPS_LISTEN +#else +/* This is Linux */ +# define __TCP_LISTEN TCP_LISTEN +#endif + if (info.tcpi_state != __TCP_LISTEN) { + errno = ret = ERANGE; + perror("not __TCP_LISTEN => ERANGE..."); + close(sock); + return ret; + } + } +#endif /* TCP_INFO */ } *_sock = sock; diff --git a/tests/test_echo_tcp_socket_options.c b/tests/test_echo_tcp_socket_options.c index dfa46fe..5e5661d 100644 --- a/tests/test_echo_tcp_socket_options.c +++ b/tests/test_echo_tcp_socket_options.c @@ -11,12 +11,25 @@ #include #include #include +#ifdef HAVE_NETINET_TCP_FSM_H +#include +#endif #include #include #include #include #include +#ifdef HAVE_NETINET_TCP_FSM_H +/* This is FreeBSD */ +# define __TCP_ESTABLISHED TCPS_ESTABLISHED +# define __TCP_CLOSE TCPS_CLOSED +#else +/* This is Linux */ +# define __TCP_ESTABLISHED TCP_ESTABLISHED +# define __TCP_CLOSE TCP_CLOSE +#endif + #ifndef ZERO_STRUCT #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) #endif @@ -300,6 +313,9 @@ static void test_sockopt_tcp(void **state) .sa_socklen = sizeof(struct sockaddr_in), }; int opt = -1; +#ifdef TCP_INFO + struct tcp_info info; +#endif socklen_t optlen = sizeof(int); int rc; @@ -318,9 +334,27 @@ static void test_sockopt_tcp(void **state) &addr.sa.in.sin_addr); assert_int_equal(rc, 1); +#ifdef TCP_INFO + ZERO_STRUCT(info); + optlen = sizeof(info); + rc = getsockopt(s, IPPROTO_TCP, TCP_INFO, &info, &optlen); + assert_return_code(rc, errno); + assert_int_equal(optlen, sizeof(info)); + printf("info.tcpi_state=0x%x\n", info.tcpi_state); + printf("info.tcpi_rto=%u\n", info.tcpi_rto); + printf("info.tcpi_rtt=%u\n", info.tcpi_rtt); + printf("info.tcpi_rttvar=%u\n", info.tcpi_rttvar); + assert_int_equal(info.tcpi_state, __TCP_CLOSE); + assert_int_not_equal(info.tcpi_rto, 0); + assert_int_equal(info.tcpi_rtt, 0); + assert_int_not_equal(info.tcpi_rttvar, 0); +#endif /* TCP_INFO */ + rc = connect(s, &addr.sa.s, addr.sa_socklen); assert_int_equal(rc, 0); + opt = -1; + optlen = sizeof(int); rc = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen); assert_return_code(rc, errno); assert_int_equal(opt, 0); @@ -336,6 +370,22 @@ static void test_sockopt_tcp(void **state) assert_return_code(rc, errno); assert_int_equal(opt, 1); +#ifdef TCP_INFO + ZERO_STRUCT(info); + optlen = sizeof(info); + rc = getsockopt(s, IPPROTO_TCP, TCP_INFO, &info, &optlen); + assert_return_code(rc, errno); + assert_int_equal(optlen, sizeof(info)); + printf("info.tcpi_state=0x%x\n", info.tcpi_state); + printf("info.tcpi_rto=%u\n", info.tcpi_rto); + printf("info.tcpi_rtt=%u\n", info.tcpi_rtt); + printf("info.tcpi_rttvar=%u\n", info.tcpi_rttvar); + assert_int_equal(info.tcpi_state, __TCP_ESTABLISHED); + assert_int_not_equal(info.tcpi_rto, 0); + assert_int_not_equal(info.tcpi_rtt, 0); + assert_int_not_equal(info.tcpi_rttvar, 0); +#endif /* TCP_INFO */ + close(s); } -- GitLab From 8f991522e1666d4a44f1f428536fc574c34d72ea Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 8 Jun 2020 14:18:44 +0200 Subject: [PATCH 3/4] socket_wrapper.c: make FIONREAD handling more robust in swrap_vioctl() We should only dereference the va args when the kernel already checked they are valid. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11897 Signed-off-by: Stefan Metzmacher (cherry picked from commit c95b7cb1d7b9348472276edceff71889aa676d25) --- src/socket_wrapper.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 4fb7b23..e7a7a8a 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -4635,7 +4635,7 @@ static int swrap_vioctl(int s, unsigned long int r, va_list va) { struct socket_info *si = find_socket_info(s); va_list ap; - int value; + int *value_ptr = NULL; int rc; if (!si) { @@ -4650,11 +4650,13 @@ static int swrap_vioctl(int s, unsigned long int r, va_list va) switch (r) { case FIONREAD: - value = *((int *)va_arg(ap, int *)); + if (rc == 0) { + value_ptr = ((int *)va_arg(ap, int *)); + } if (rc == -1 && errno != EAGAIN && errno != ENOBUFS) { swrap_pcap_dump_packet(si, NULL, SWRAP_PENDING_RST, NULL, 0); - } else if (value == 0) { /* END OF FILE */ + } else if (value_ptr != NULL && *value_ptr == 0) { /* END OF FILE */ swrap_pcap_dump_packet(si, NULL, SWRAP_PENDING_RST, NULL, 0); } break; -- GitLab From 2c2a16fdaa26fc6cb7423c8fb564b3e565538ef7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 8 Jun 2020 14:21:25 +0200 Subject: [PATCH 4/4] socket_wrapper.c: let swrap_vioctl() handle SIOCOUTQ/TIOCOUTQ/FIONWRITE explicitly They are used to ask for the number of unacked bytes in the send queue, with AF_UNIX sockets get strange result, on linux 5.3 I get more bytes reported than I sent into the socket. All bytes reach the destination directly, so we can just always report 0 unacked bytes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11897 Signed-off-by: Stefan Metzmacher (cherry picked from commit f317ebcdcdd626ed9e06de2eb60031306994c803) --- src/socket_wrapper.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index e7a7a8a..333bdd4 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -4660,6 +4660,24 @@ static int swrap_vioctl(int s, unsigned long int r, va_list va) swrap_pcap_dump_packet(si, NULL, SWRAP_PENDING_RST, NULL, 0); } break; +#ifdef FIONWRITE + case FIONWRITE: + /* this is FreeBSD */ + FALL_THROUGH; /* to TIOCOUTQ */ +#endif /* FIONWRITE */ + case TIOCOUTQ: /* same as SIOCOUTQ on Linux */ + /* + * This may return more bytes then the application + * sent into the socket, for tcp it should + * return the number of unacked bytes. + * + * On AF_UNIX, all bytes are immediately acked! + */ + if (rc == 0) { + value_ptr = ((int *)va_arg(ap, int *)); + *value_ptr = 0; + } + break; } va_end(ap); -- GitLab