From owner-svn-src-all@FreeBSD.ORG  Mon May 19 08:08:00 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 797FB71D;
 Mon, 19 May 2014 08:08:00 +0000 (UTC)
Received: from gw.catspoiler.org (gw.catspoiler.org [75.1.14.242])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A8252D91;
 Mon, 19 May 2014 08:08:00 +0000 (UTC)
Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2])
 by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id s4J87oGY097257;
 Mon, 19 May 2014 01:07:54 -0700 (PDT)
 (envelope-from truckman@FreeBSD.org)
Message-Id: <201405190807.s4J87oGY097257@gw.catspoiler.org>
Date: Mon, 19 May 2014 01:07:50 -0700 (PDT)
From: Don Lewis <truckman@FreeBSD.org>
Subject: Re: svn commit: r266428 - stable/10/sys/kern
To: src-committers@FreeBSD.org
In-Reply-To: <201405190455.s4J4tsec008010@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=us-ascii
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
 svn-src-stable-10@FreeBSD.org
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, 19 May 2014 08:08:00 -0000

On 19 May, To: src-committers@freebsd.org wrote:
> Author: truckman
> Date: Mon May 19 04:55:53 2014
> New Revision: 266428
> URL: http://svnweb.freebsd.org/changeset/base/266428
> 
> Log:

MFC r265931

>   Be even more paranoid about overflow.
>   
>   Requested by:	ache
> 
> Modified:
>   stable/10/sys/kern/subr_rman.c
> Directory Properties:
>   stable/10/   (props changed)
> 
> Modified: stable/10/sys/kern/subr_rman.c
> ==============================================================================
> --- stable/10/sys/kern/subr_rman.c	Mon May 19 04:53:43 2014	(r266427)
> +++ stable/10/sys/kern/subr_rman.c	Mon May 19 04:55:53 2014	(r266428)
> @@ -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;
>  		}
>