From owner-p4-projects@FreeBSD.ORG  Sun Jun 13 10:19:41 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 957DE16A4D1; Sun, 13 Jun 2004 10:19:41 +0000 (GMT)
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 6EDEB16A4CE
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:19:41 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 68F7143D45
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:19:41 +0000 (GMT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5DAIAZK097592
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:18:10 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5DAIAQu097584
	for perforce@freebsd.org; Sun, 13 Jun 2004 10:18:10 GMT
	(envelope-from jmallett@freebsd.org)
Date: Sun, 13 Jun 2004 10:18:10 GMT
Message-Id: <200406131018.i5DAIAQu097584@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54808 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 13 Jun 2004 10:19:42 -0000

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

Change 54808 by jmallett@jmallett_oingo on 2004/06/13 10:17:48

	Use check_address when checking the GIO slots.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/gio/gio.c#3 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/gio/gio.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/sgimips/gio/gio.c#2 $
+ * $P4: //depot/projects/mips/sys/mips/sgimips/gio/gio.c#3 $
  */
 
 #include <sys/cdefs.h>
@@ -36,6 +36,7 @@
 #include <sys/bus.h>
 #include <sys/rman.h>
 
+#include <machine/trap.h>
 #include <platform/models.h>
 #include <platform/gio/gioreg.h>
 #include <platform/gio/giovar.h>
@@ -85,8 +86,13 @@
 	struct gio_device *gd;
 	uint32_t product;
 	device_t dev;
+	int error;
 
 	product = bus_space_read_4(iv->gi_tag, iv->gi_handle, 0);
+	/* XXX subverts bus space */
+	error = check_address((char *)MIPS_PHYS_TO_KSEG1(iv->gi_handle));
+	if (error != 0)
+		return (ENODEV);
 	for (gd = gio_devices; gd->gd_name != NULL; gd++) {
 		if (gd->gd_product == product) {
 			dev = device_add_child(gio, gd->gd_name, -1);