From owner-svn-src-head@FreeBSD.ORG  Thu Aug 29 15:59:06 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2FDBF750;
 Thu, 29 Aug 2013 15:59:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DF00235D;
 Thu, 29 Aug 2013 15:59:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TFx5LX020198;
 Thu, 29 Aug 2013 15:59:05 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TFx5r5020197;
 Thu, 29 Aug 2013 15:59:05 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201308291559.r7TFx5r5020197@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 29 Aug 2013 15:59:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255030 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 15:59:06 -0000

Author: jhb
Date: Thu Aug 29 15:59:05 2013
New Revision: 255030
URL: http://svnweb.freebsd.org/changeset/base/255030

Log:
  Don't return an error for socket timeouts that are too large.  Just
  cap them to INT_MAX ticks instead.
  
  PR:		kern/181416 (r254699 really)
  Requested by:	bde
  MFC after:	2 weeks

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Thu Aug 29 15:58:20 2013	(r255029)
+++ head/sys/kern/uipc_socket.c	Thu Aug 29 15:59:05 2013	(r255030)
@@ -2698,17 +2698,12 @@ sosetopt(struct socket *so, struct socko
 				    sizeof tv);
 			if (error)
 				goto bad;
-
-			if (tv.tv_sec < 0 || tv.tv_sec > INT_MAX / hz ||
-			    tv.tv_usec < 0 || tv.tv_usec >= 1000000) {
+			if (tv.tv_sec < 0 || tv.tv_usec < 0 ||
+			    tv.tv_usec >= 1000000) {
 				error = EDOM;
 				goto bad;
 			}
 			val = tvtohz(&tv);
-			if (val == INT_MAX) {
-				error = EDOM;
-				goto bad;
-			}
 
 			switch (sopt->sopt_name) {
 			case SO_SNDTIMEO: