From owner-svn-src-stable@FreeBSD.ORG  Mon May 19 07:49:13 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 91B2C585;
 Mon, 19 May 2014 07:49:13 +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 7F81B2AE5;
 Mon, 19 May 2014 07:49:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4J7nDSx017525;
 Mon, 19 May 2014 07:49:13 GMT
 (envelope-from truckman@svn.freebsd.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4J7nD9E017524;
 Mon, 19 May 2014 07:49:13 GMT
 (envelope-from truckman@svn.freebsd.org)
Message-Id: <201405190749.s4J7nD9E017524@svn.freebsd.org>
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 19 May 2014 07:49:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r266433 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 07:49:13 -0000

Author: truckman
Date: Mon May 19 07:49:13 2014
New Revision: 266433
URL: http://svnweb.freebsd.org/changeset/base/266433

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

Modified:
  stable/9/sys/kern/subr_rman.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/subr_rman.c
==============================================================================
--- stable/9/sys/kern/subr_rman.c	Mon May 19 07:49:09 2014	(r266432)
+++ stable/9/sys/kern/subr_rman.c	Mon May 19 07:49:13 2014	(r266433)
@@ -461,8 +461,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;
 	}
 
@@ -482,8 +482,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;
 		}