From owner-svn-src-all@FreeBSD.ORG  Sun Jul  1 12:59:01 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 08988106566C;
	Sun,  1 Jul 2012 12:59:01 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E87C98FC0A;
	Sun,  1 Jul 2012 12:59:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q61Cx0sZ003287;
	Sun, 1 Jul 2012 12:59:00 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q61Cx0LR003284;
	Sun, 1 Jul 2012 12:59:00 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201207011259.q61Cx0LR003284@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 1 Jul 2012 12:59:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237924 - head/sys/i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 01 Jul 2012 12:59:01 -0000

Author: brueffer
Date: Sun Jul  1 12:59:00 2012
New Revision: 237924
URL: http://svn.freebsd.org/changeset/base/237924

Log:
  Replace an unreachable panic() in vm86_getptr (been there for 13 years) with
  a KASSERT() behind the functions's only consumer.
  
  Suggested by:	kib
  Reviewed by:	kib
  CID:		4494
  Found with:	Coverity Prevent(tm)
  MFC after:	2 weeks

Modified:
  head/sys/i386/i386/machdep.c
  head/sys/i386/i386/vm86.c

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Sun Jul  1 12:48:56 2012	(r237923)
+++ head/sys/i386/i386/machdep.c	Sun Jul  1 12:59:00 2012	(r237924)
@@ -2176,7 +2176,7 @@ basemem_setup(void)
 static void
 getmemsize(int first)
 {
-	int has_smap, off, physmap_idx, pa_indx, da_indx;
+	int has_smap, off, physmap_idx, pa_indx, da_indx, res;
 	u_long physmem_tunable, memtest;
 	vm_paddr_t physmap[PHYSMAP_SIZE];
 	pt_entry_t *pte;
@@ -2267,7 +2267,8 @@ getmemsize(int first)
 	pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1 << PAGE_SHIFT);
 	vmc.npages = 0;
 	smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT));
-	vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di);
+	res = vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di);
+	KASSERT(res != 0, ("vm86_getptr() failed: address not found"));
 
 	vmf.vmf_ebx = 0;
 	do {

Modified: head/sys/i386/i386/vm86.c
==============================================================================
--- head/sys/i386/i386/vm86.c	Sun Jul  1 12:48:56 2012	(r237923)
+++ head/sys/i386/i386/vm86.c	Sun Jul  1 12:59:00 2012	(r237924)
@@ -650,7 +650,6 @@ vm86_getptr(vmc, kva, sel, off)
 			return (1);
 		}
 	return (0);
-	panic("vm86_getptr: address not found");
 }
 	
 int