From owner-svn-src-all@FreeBSD.ORG  Mon May 12 20:22:43 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 ESMTPS id 6A099DC5;
 Mon, 12 May 2014 20:22:43 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 571422BAD;
 Mon, 12 May 2014 20:22:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CKMh9b037125;
 Mon, 12 May 2014 20:22:43 GMT
 (envelope-from truckman@svn.freebsd.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CKMh8U037124;
 Mon, 12 May 2014 20:22:43 GMT
 (envelope-from truckman@svn.freebsd.org)
Message-Id: <201405122022.s4CKMh8U037124@svn.freebsd.org>
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 12 May 2014 20:22:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265931 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 May 2014 20:22:43 -0000

Author: truckman
Date: Mon May 12 20:22:42 2014
New Revision: 265931
URL: http://svnweb.freebsd.org/changeset/base/265931

Log:
  Be even more paranoid about overflow.
  
  Requested by:	ache

Modified:
  head/sys/kern/subr_rman.c

Modified: head/sys/kern/subr_rman.c
==============================================================================
--- head/sys/kern/subr_rman.c	Mon May 12 20:19:40 2014	(r265930)
+++ head/sys/kern/subr_rman.c	Mon May 12 20:22:42 2014	(r265931)
@@ -466,8 +466,8 @@ rman_reserve_resource_bound(struct rman 
 	}
 
 	amask = (1ul << RF_ALIGNMENT(flags)) - 1;
-	if (start + amask < start) {
-		DPRINTF(("start+amask wrapped around\n"));
+	if (start > ULONG_MAX - amask) {
+		DPRINTF(("start+amask would wrap around\n"));
 		goto out;
 	}
 
@@ -487,8 +487,8 @@ rman_reserve_resource_bound(struct rman 
 			    s->r_start, end));
 			break;
 		}
-		if (s->r_start + amask < s->r_start) {
-			DPRINTF(("s->r_start (%#lx) + amask (%#lx) wrapped\n",
+		if (s->r_start > ULONG_MAX - amask) {
+			DPRINTF(("s->r_start (%#lx) + amask (%#lx) too large\n",
 			    s->r_start, amask));
 			break;
 		}