summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormickey <mickey@openbsd.org>2002-11-27 13:31:09 +0000
committermickey <mickey@openbsd.org>2002-11-27 13:31:09 +0000
commita9774ff7841b7e75faf10594ec5c097b8b9e5a9d (patch)
treebbc369e432cb726287c0f78923c06a41ed39faec
parentcorrect hppa attachments (diff)
downloadwireguard-openbsd-a9774ff7841b7e75faf10594ec5c097b8b9e5a9d.tar.xz
wireguard-openbsd-a9774ff7841b7e75faf10594ec5c097b8b9e5a9d.zip
fix an underflow in socket timeout calculations.
(see http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/32827). itojun@ ok
-rw-r--r--sys/kern/uipc_socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index cfbb7413c68..c23b7f07ee4 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket.c,v 1.46 2002/08/08 19:18:12 provos Exp $ */
+/* $OpenBSD: uipc_socket.c,v 1.47 2002/11/27 13:31:09 mickey Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@@ -1084,6 +1084,8 @@ sosetopt(so, level, optname, m0)
goto bad;
}
val = tv->tv_sec * hz + tv->tv_usec / tick;
+ if (val == 0 && tv->tv_usec != 0)
+ val = 1;
switch (optname) {