From owner-svn-src-head@freebsd.org  Mon Aug 10 17:16:49 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC83599E45B;
 Mon, 10 Aug 2015 17:16:49 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 DD483D3F;
 Mon, 10 Aug 2015 17:16:49 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7AHGnr1040221;
 Mon, 10 Aug 2015 17:16:49 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7AHGnUB040220;
 Mon, 10 Aug 2015 17:16:49 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201508101716.t7AHGnUB040220@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Mon, 10 Aug 2015 17:16:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286583 - head/sys/vm
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.20
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: Mon, 10 Aug 2015 17:16:50 -0000

Author: zbb
Date: Mon Aug 10 17:16:49 2015
New Revision: 286583
URL: https://svnweb.freebsd.org/changeset/base/286583

Log:
  Avoid sign extension of value passed to kva_alloc from uma_zone_reserve_kva
  
  Fixes "panic: vm_radix_reserve_kva: unable to reserve KVA" caused by sign
  extention of "pages * UMA_SLAB_SIZE" value passed to kva_alloc() which
  takes unsigned long argument.
  
  In the erroneus case that triggered this bug, the number of pages
  to allocate in uma_zone_reserve_kva() was 0x8ebe6, that gave the
  total number of bytes to allocate equal to 0x8ebe6000 (int).
  This was then sign extended in kva_alloc() to 0xffffffff8ebe6000
  (unsigned long).
  
  Reviewed by:   alc, kib
  Submitted by:  Zbigniew Bodek <zbb@semihalf.com>
  Obtained from: Semihalf
  Sponsored by:  The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D3346

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Mon Aug 10 17:02:42 2015	(r286582)
+++ head/sys/vm/uma_core.c	Mon Aug 10 17:16:49 2015	(r286583)
@@ -3126,7 +3126,7 @@ uma_zone_reserve_kva(uma_zone_t zone, in
 {
 	uma_keg_t keg;
 	vm_offset_t kva;
-	int pages;
+	u_int pages;
 
 	keg = zone_first_keg(zone);
 	if (keg == NULL)
@@ -3141,7 +3141,7 @@ uma_zone_reserve_kva(uma_zone_t zone, in
 #else
 	if (1) {
 #endif
-		kva = kva_alloc(pages * UMA_SLAB_SIZE);
+		kva = kva_alloc((vm_size_t)pages * UMA_SLAB_SIZE);
 		if (kva == 0)
 			return (0);
 	} else