From owner-p4-projects@FreeBSD.ORG  Wed Jun 29 21:50:23 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77FB716A420; Wed, 29 Jun 2005 21:50:23 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3AAB316A41F
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:50:23 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1714C43D5D
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:50:23 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5TLoMua047430
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:50:22 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5TLoMeY047427
	for perforce@freebsd.org; Wed, 29 Jun 2005 21:50:22 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 29 Jun 2005 21:50:22 GMT
Message-Id: <200506292150.j5TLoMeY047427@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79196 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2005 21:50:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=79196

Change 79196 by peter@peter_daintree on 2005/06/29 21:50:17

	OK, kvm_kvatop() should have been off_t.
	While here, fix the type of pa that we pass a pointer
	to - fixed potential stack corruption here on 32 bit platform.

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm.c#6 edit
.. //depot/projects/hammer/lib/libkvm/kvm_private.h#3 edit

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm.c#6 (text+ko) ====

@@ -369,7 +369,7 @@
 	} else {
 		cp = buf;
 		while (len > 0) {
-			u_long pa;
+			off_t pa;
 
 			cc = _kvm_kvatop(kd, kva, &pa);
 			if (cc == 0)
@@ -377,7 +377,7 @@
 			if (cc > len)
 				cc = len;
 			errno = 0;
-			if (lseek(kd->pmfd, (off_t)pa, 0) == -1 && errno != 0) {
+			if (lseek(kd->pmfd, pa, 0) == -1 && errno != 0) {
 				_kvm_syserr(kd, 0, _PATH_MEM);
 				break;
 			}

==== //depot/projects/hammer/lib/libkvm/kvm_private.h#3 (text+ko) ====

@@ -75,7 +75,7 @@
 void	 _kvm_freeprocs(kvm_t *kd);
 void	 _kvm_freevtop(kvm_t *);
 int	 _kvm_initvtop(kvm_t *);
-int	 _kvm_kvatop(kvm_t *, u_long, uint64_t *);
+int	 _kvm_kvatop(kvm_t *, u_long, off_t *);
 void	*_kvm_malloc(kvm_t *kd, size_t);
 void	*_kvm_realloc(kvm_t *kd, void *, size_t);
 void	 _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)