From owner-svn-src-all@FreeBSD.ORG  Thu Jan 16 06:26:05 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 94484B38;
 Thu, 16 Jan 2014 06:26:05 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 80E4A11EC;
 Thu, 16 Jan 2014 06:26:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0G6Q3eC047120;
 Thu, 16 Jan 2014 06:26:03 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0G6Q3cK047119;
 Thu, 16 Jan 2014 06:26:03 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201401160626.s0G6Q3cK047119@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 16 Jan 2014 06:26:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260701 - head/lib/libkvm
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.17
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: Thu, 16 Jan 2014 06:26:05 -0000

Author: marcel
Date: Thu Jan 16 06:26:03 2014
New Revision: 260701
URL: http://svnweb.freebsd.org/changeset/base/260701

Log:
  Handle truncation of the size returned by _kvm_kvatop(). Cores can have
  segments larger than INT_MAX.

Modified:
  head/lib/libkvm/kvm_ia64.c

Modified: head/lib/libkvm/kvm_ia64.c
==============================================================================
--- head/lib/libkvm/kvm_ia64.c	Thu Jan 16 00:20:42 2014	(r260700)
+++ head/lib/libkvm/kvm_ia64.c	Thu Jan 16 06:26:03 2014	(r260701)
@@ -371,5 +371,5 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t 
 	size_t sz;
 
 	sz = kd->vmst->kvatop(kd, va, ofs);
-	return (sz);
+	return ((sz > INT_MAX) ? INT_MAX : sz);
 }