CVS commit: src/sys/kern

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Tue Aug 16 23:32:15 UTC 2011

Modified Files:
        src/sys/kern: kern_stub.c

Log Message:
Protect against bugs by using __strict_weak_alias() for
bus_space_is_equal() and bus_space_handle_is_equal().


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/kern_stub.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.34 src/sys/kern/kern_stub.c:1.35
--- src/sys/kern/kern_stub.c:1.34	Wed Jul  6 18:24:26 2011
+++ src/sys/kern/kern_stub.c	Tue Aug 16 23:32:15 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_stub.c,v 1.34 2011/07/06 18:24:26 dyoung Exp $	*/
+/*	$NetBSD: kern_stub.c,v 1.35 2011/08/16 23:32:15 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.34 2011/07/06 18:24:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.35 2011/08/16 23:32:15 dyoung Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
@@ -82,7 +82,8 @@
 #include <sys/userconf.h>
 
 bool default_bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
-bool default_bus_space_handle_is_equal(bus_space_handle_t, bus_space_handle_t);
+bool default_bus_space_handle_is_equal(bus_space_tag_t, bus_space_handle_t,
+    bus_space_handle_t);
 
 /*
  * Nonexistent system call-- signal process (may want to handle it).  Flag
@@ -137,8 +138,9 @@
 __weak_alias(bus_space_reservation_unmap, voidop);
 __weak_alias(bus_space_tag_create, eopnotsupp);
 __weak_alias(bus_space_tag_destroy, voidop);
-__weak_alias(bus_space_is_equal, default_bus_space_is_equal);
-__weak_alias(bus_space_handle_is_equal, default_bus_space_handle_is_equal);
+__strict_weak_alias(bus_space_is_equal, default_bus_space_is_equal);
+__strict_weak_alias(bus_space_handle_is_equal,
+    default_bus_space_handle_is_equal);
 __weak_alias(userconf_bootinfo, voidop);
 __weak_alias(userconf_init, voidop);
 __weak_alias(userconf_prompt, voidop);
@@ -277,7 +279,8 @@
 }
 
 bool
-default_bus_space_handle_is_equal(bus_space_handle_t h1, bus_space_handle_t h2)
+default_bus_space_handle_is_equal(bus_space_tag_t t,
+    bus_space_handle_t h1, bus_space_handle_t h2)
 {
 
 	return memcmp(&h1, &h2, sizeof(h1)) == 0;