Module Name: src Committed By: pgoyette Date: Mon Dec 11 22:00:26 UTC 2017
Modified Files: src/sys/kern: kern_module.c Log Message: Use KASSERT to ensure that the newly-added module's name can be found. XXX Pull-up to -8 To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 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.126 src/sys/kern/kern_module.c:1.127 --- src/sys/kern/kern_module.c:1.126 Sun Dec 10 03:08:32 2017 +++ src/sys/kern/kern_module.c Mon Dec 11 22:00:26 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_module.c,v 1.126 2017/12/10 03:08:32 pgoyette Exp $ */ +/* $NetBSD: kern_module.c,v 1.127 2017/12/11 22:00:26 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.126 2017/12/10 03:08:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.127 2017/12/11 22:00:26 pgoyette Exp $"); #define _MODULE_INTERNAL @@ -1047,7 +1047,8 @@ module_do_load(const char *name, bool is */ if (mod->mod_source == MODULE_SOURCE_FILESYS) { mod2 = module_lookup(mod->mod_info->mi_name); - if (mod2 && mod2 != mod) { + KASSERTMSG(mod2, "Newly added module not found!"); + if (mod2 != mod) { module_error("module with name `%s' already loaded", mod2->mod_info->mi_name); error = EEXIST;