d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent loading modules with are compiled into the kernel.

Browse Source 
PR:		kern/48759
Submitted by:	Pawe³ Ma³achowski <pawmal@unia.3lo.lublin.pl>
Patch from:	demon
MFC after:	2 weeks
This commit is contained in:
pjd 2005-05-28 22:29:44 +00:00
parent d49fabe2d3
commit 7543a23525
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_linker.c
View File

@ -300,9 +300,11 @@ linker_file_register_modules(linker_file_t lf)
KLD_DPF(FILE, ("Registering module %s in %s\n",
moddata->name, lf->filename));
error = module_register(moddata, lf);
if (error)
if (error) {
printf("Module %s failed to register: %d\n",
moddata->name, error);
return (error);
}
}
return (0);
}
@ -354,7 +356,11 @@ linker_load_file(const char *filename, linker_file_t *result)
if (error != ENOENT)
foundfile = 1;
if (lf) {
linker_file_register_modules(lf);
error = linker_file_register_modules(lf);
if (error == EEXIST) {
linker_file_unload(lf, LINKER_UNLOAD_FORCE);
goto out;
}
linker_file_register_sysctls(lf);
linker_file_sysinit(lf);
lf->flags |= LINKER_FILE_LINKED;