diff options
| author | Dan McDonald <danmcd@joyent.com> | 2019-08-12 11:48:52 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-08-13 14:16:27 -0400 |
| commit | 67641ea6388b5f3e3e6a72aadf956313c58ca521 (patch) | |
| tree | 7b9fc685dc60ce16ca998df7034a8a2a401eea8a /usr/src | |
| parent | 0360c6a8996bc74a9d2ad3fb4ea9201732a4deac (diff) | |
| download | illumos-joyent-67641ea6388b5f3e3e6a72aadf956313c58ca521.tar.gz | |
OS-7947 OS-7899 causes failure mode with SO_REUSEADDR and SOCK_DGRAM
Reviewed by: Michael Zeller <mike.zeller@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/brand/lx/syscall/lx_socket.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/usr/src/uts/common/brand/lx/syscall/lx_socket.c b/usr/src/uts/common/brand/lx/syscall/lx_socket.c index 896f65e0cd..4822d147c6 100644 --- a/usr/src/uts/common/brand/lx/syscall/lx_socket.c +++ b/usr/src/uts/common/brand/lx/syscall/lx_socket.c @@ -3021,6 +3021,16 @@ lx_mcast_common(sonode_t *so, int level, int optname, void *optval, return (error); } + +/* + * NOTE: For now, the following mess applies to TCP (i.e. AF_INET{,6} + + * SOCK_STREAM) only, until we enable SO_REUSEPORT for other socket/protocol + * types as well. The lx_so_needs_reusehandling() macro indicates what + * socket(s) apply to the following mess. + */ +#define lx_so_needs_reusehandling(so) ((so)->so_type == SOCK_STREAM && \ + ((so)->so_family == AF_INET || (so)->so_family == AF_INET6)) + /* * So in Linux, the SO_REUSEADDR includes, essentially, SO_REUSEPORT as part * of its functionality. Experiments on CentOS 7 with a 3.10-ish kernel show @@ -3611,8 +3621,15 @@ lx_setsockopt_socket(sonode_t *so, int optname, void *optval, socklen_t optlen) case LX_SO_REUSEADDR: case LX_SO_REUSEPORT: - /* See the function called below for the oddness of REUSE*. */ - return (lx_set_reuse_handler(so, optname, optval, optlen)); + if (lx_so_needs_reusehandling(so)) { + /* + * See lx_set_reuse_handler's comments for the oddness + * of REUSE* in some cases. + */ + return (lx_set_reuse_handler(so, optname, optval, + optlen)); + } + break; case LX_SO_PASSCRED: /* @@ -3975,9 +3992,13 @@ lx_getsockopt_socket(sonode_t *so, int optname, void *optval, break; case LX_SO_REUSEPORT: - /* See lx_set_reuse_handler() for the sordid details. */ - if (so->so_family != AF_INET && so->so_family != AF_INET6) + /* + * See lx_so_needs_reusehandling() and lx_set_reuse_handler() + * for the sordid details. + */ + if (!lx_so_needs_reusehandling(so)) break; + if (*optlen < sizeof (int)) return (EINVAL); sad = lx_sad_acquire(SOTOV(so)); |