Module Name: src
Committed By: sborrill
Date: Fri Nov 18 21:22:49 UTC 2011
Modified Files:
src/sys/kern [netbsd-5]: kern_module.c
Log Message:
Pull up the following revisions(s) (requested by tron in ticket #1688):
sys/kern/kern_module.c: revision 1.84
Return ENOEXEC instead of 0 if the info of a kernel module doesn't have the
expected size. This prevents kernel panics when loading broken modules.
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 src/sys/kern/kern_module.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_module.c
diff -u src/sys/kern/kern_module.c:1.24.4.1 src/sys/kern/kern_module.c:1.24.4.2
--- src/sys/kern/kern_module.c:1.24.4.1 Mon Feb 2 22:15:15 2009
+++ src/sys/kern/kern_module.c Fri Nov 18 21:22:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.24.4.1 2009/02/02 22:15:15 snj Exp $ */
+/* $NetBSD: kern_module.c,v 1.24.4.2 2011/11/18 21:22:48 sborrill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "opt_modular.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.24.4.1 2009/02/02 22:15:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.24.4.2 2011/11/18 21:22:48 sborrill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -750,7 +750,7 @@ module_fetch_info(module_t *mod)
}
if (size != sizeof(modinfo_t **)) {
module_error("`link_set_modules' section wrong size");
- return error;
+ return ENOEXEC;
}
mod->mod_info = *(modinfo_t **)addr;
