summaryrefslogtreecommitdiffstats
path: root/sys/kern/uipc_socket.c
diff options
context:
space:
mode:
authormaxim <maxim@FreeBSD.org>2002-11-27 13:34:04 +0000
committermaxim <maxim@FreeBSD.org>2002-11-27 13:34:04 +0000
commitd8b13d0f355b81db22518b012dc578ddbdc30b80 (patch)
treeae49ff4c2293a7e114567bc44b6a3436de3e1eee /sys/kern/uipc_socket.c
parent556b103f4a87269db98ef41532dfe7ffb70e8676 (diff)
downloadFreeBSD-src-d8b13d0f355b81db22518b012dc578ddbdc30b80.zip
FreeBSD-src-d8b13d0f355b81db22518b012dc578ddbdc30b80.tar.gz
Small SO_RCVTIMEO and SO_SNDTIMEO values are mistakenly taken to be zero.
PR: kern/32827 Submitted by: Hartmut Brandt <brandt@fokus.gmd.de> Approved by: re (jhb) MFC after: 2 weeks
Diffstat (limited to 'sys/kern/uipc_socket.c')
-rw-r--r--sys/kern/uipc_socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 3aefa87..5dd4406 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1380,6 +1380,8 @@ sosetopt(so, sopt)
error = EDOM;
goto bad;
}
+ if (val == 0 && tv.tv_usec != 0)
+ val = 1;
switch (sopt->sopt_name) {
case SO_SNDTIMEO:
OpenPOWER on IntegriCloud