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

Check that scheme is not already registered. This may happens when a

Browse Source 
KLD is preloaded with loader(8) and leads to infinity loops.

Also do not return EEXIST error code from MOD_LOAD handler, because
we have undocumented(?) ability replace kernel's module with preloaded one.
And if we have so, then preloaded module will be initialized first.
Thus error in MOD_LOAD handler will be triggered for the kernel.

PR:		kern/165573
MFC after:	3 weeks
This commit is contained in:
Andrey V. Elsukov 2012-03-23 07:26:17 +00:00
parent 218eced404
commit 472794bb9f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/geom/part/g_part.c
View File

@ -2211,23 +2211,32 @@ g_part_unload_event(void *arg, int flag)
int
g_part_modevent(module_t mod, int type, struct g_part_scheme *scheme)
{
struct g_part_scheme *iter;
uintptr_t arg;
int error;
error = 0;
switch (type) {
case MOD_LOAD:
TAILQ_INSERT_TAIL(&g_part_schemes, scheme, scheme_list);
error = g_retaste(&g_part_class);
if (error)
TAILQ_REMOVE(&g_part_schemes, scheme, scheme_list);
TAILQ_FOREACH(iter, &g_part_schemes, scheme_list) {
if (scheme == iter) {
printf("GEOM_PART: scheme %s is already "
"registered!\n", scheme->name);
break;
}
}
if (iter == NULL) {
TAILQ_INSERT_TAIL(&g_part_schemes, scheme,
scheme_list);
g_retaste(&g_part_class);
}
break;
case MOD_UNLOAD:
arg = (uintptr_t)scheme;
error = g_waitfor_event(g_part_unload_event, &arg, M_WAITOK,
NULL);
if (!error)
error = (arg == (uintptr_t)scheme) ? EDOOFUS : arg;
if (error == 0)
error = arg;
break;
default:
error = EOPNOTSUPP;