From b2c73cbf423de6201f956f522b7429615c88869d Mon Sep 17 00:00:00 2001 From: Zhou Zhengping Date: Fri, 24 Jun 2016 06:33:16 +0800 Subject: rpc: invalid argument when function setsockopt sets option TCP_USER_TIMEOUT If option "transport.tcp-user-timeout" hasn't been setted, glusterd's priv->timeout will be -1, which will cause invalid argument when set TCP_USER_TIMEOUT. Change-Id: Ibc16264ceac0e69ab4a217ffa27c549b9fa21df9 BUG: 1349657 Signed-off-by: Zhou Zhengping Reviewed-on: http://review.gluster.org/14785 CentOS-regression: Gluster Build System Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Jeff Darcy --- rpc/rpc-transport/socket/src/socket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rpc') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index e4f72cd8bdc..3aae10bd501 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -865,6 +865,8 @@ __socket_keepalive (int fd, int family, int keepalive_intvl, } #if defined(TCP_USER_TIMEOUT) + if (timeout_ms < 0) + goto done; ret = setsockopt (fd, IPPROTO_TCP , TCP_USER_TIMEOUT, &timeout_ms, sizeof (timeout_ms)); if (ret == -1) { -- cgit