diff options
| author | jhb <jhb@FreeBSD.org> | 2013-08-23 13:47:41 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-08-23 13:47:41 +0000 |
| commit | 6d81dda61eb6274ed572fd3fdecf93ea3d0c679f (patch) | |
| tree | 87e3dbd3ba515d717e2a0cf83e81c01b796c0ef8 | |
| parent | 8ea56ff7c49796080d4408205a9ff8db85f2775e (diff) | |
| download | FreeBSD-src-6d81dda61eb6274ed572fd3fdecf93ea3d0c679f.zip FreeBSD-src-6d81dda61eb6274ed572fd3fdecf93ea3d0c679f.tar.gz | |
Use tvtohz() to convert a socket buffer timeout to a tick value rather
than using a home-rolled version. The home-rolled version could result
in shorter-than-requested sleeps.
Reported by: Vitja Makarov <vitja.makarov@gmail.com>
MFC after: 2 weeks
| -rw-r--r-- | sys/kern/uipc_socket.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 9330bb4..4d0eac4 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2699,21 +2699,16 @@ sosetopt(struct socket *so, struct sockopt *sopt) if (error) goto bad; - /* assert(hz > 0); */ if (tv.tv_sec < 0 || tv.tv_sec > INT_MAX / hz || tv.tv_usec < 0 || tv.tv_usec >= 1000000) { error = EDOM; goto bad; } - /* assert(tick > 0); */ - /* assert(ULONG_MAX - INT_MAX >= 1000000); */ - val = (u_long)(tv.tv_sec * hz) + tv.tv_usec / tick; - if (val > INT_MAX) { + val = tvtohz(&tv); + if (val == INT_MAX) { error = EDOM; goto bad; } - if (val == 0 && tv.tv_usec != 0) - val = 1; switch (sopt->sopt_name) { case SO_SNDTIMEO: |
