From owner-svn-src-head@FreeBSD.ORG  Wed Jun 10 05:17:15 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA9D66F6;
 Wed, 10 Jun 2015 05:17:15 +0000 (UTC) (envelope-from alc@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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A8E41175A;
 Wed, 10 Jun 2015 05:17:15 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5A5HF3c065478;
 Wed, 10 Jun 2015 05:17:15 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5A5HFI3065477;
 Wed, 10 Jun 2015 05:17:15 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201506100517.t5A5HFI3065477@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Wed, 10 Jun 2015 05:17:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284207 - 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: Wed, 10 Jun 2015 05:17:15 -0000

Author: alc
Date: Wed Jun 10 05:17:14 2015
New Revision: 284207
URL: https://svnweb.freebsd.org/changeset/base/284207

Log:
  Correct a type error in kmem_unback().  Previously, kmem_unback() did not
  correctly handle deallocation requests of two or more gigabytes in size.
  Eventually, this would lead to a panic elsewhere in the kernel, such as
  "vm_radix_insert: key <vm_pindex_t> is already present".
  
  Reported by:	Ilias Marinos
  MFC after:	1 week

Modified:
  head/sys/vm/vm_kern.c

Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c	Wed Jun 10 04:57:09 2015	(r284206)
+++ head/sys/vm/vm_kern.c	Wed Jun 10 05:17:14 2015	(r284207)
@@ -391,8 +391,7 @@ void
 kmem_unback(vm_object_t object, vm_offset_t addr, vm_size_t size)
 {
 	vm_page_t m;
-	vm_offset_t offset;
-	int i;
+	vm_offset_t i, offset;
 
 	KASSERT(object == kmem_object || object == kernel_object,
 	    ("kmem_unback: only supports kernel objects."));