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

Don't unregister the ioctl handlers before we verified we

Browse Source 
can unload. Doing so leaves the linuxulator in a crippled
state (no ioctl support) when Linux binaries are run at
unload time.

While here, consistently spell ELF in capitals and perform
some minor style improvements.

ELF spelling submitted by: asmodai
This commit is contained in:
marcel 2000-11-23 03:21:58 +00:00
parent 45350b13e3
commit 9e0bf67c89
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/alpha/linux/linux_sysvec.c
View File

@ -224,37 +224,39 @@ linux_elf_modevent(module_t mod, int type, void *data)
++brandinfo)
if (elf_insert_brand_entry(*brandinfo) < 0)
error = EINVAL;
if (error)
printf("cannot insert Linux elf brand handler\n");
else {
linux_ioctl_register_handlers(&linux_ioctl_handler_set);
if (error == 0) {
linux_ioctl_register_handlers(
&linux_ioctl_handler_set);
if (bootverbose)
printf("Linux-ELF exec handler installed\n");
}
printf("Linux ELF exec handler installed\n");
} else
printf("cannot insert Linux ELF brand handler\n");
break;
case MOD_UNLOAD:
linux_ioctl_unregister_handlers(&linux_ioctl_handler_set);
for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL;
++brandinfo)
if (elf_brand_inuse(*brandinfo))
error = EBUSY;
if (error == 0) {
for (brandinfo = &linux_brandlist[0];
*brandinfo != NULL; ++brandinfo)
if (elf_remove_brand_entry(*brandinfo) < 0)
error = EINVAL;
}
if (error)
if (error == 0) {
linux_ioctl_unregister_handlers(
&linux_ioctl_handler_set);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
} else
printf("Could not deinstall ELF interpreter entry\n");
else if (bootverbose)
printf("Linux-elf exec handler removed\n");
break;
default:
break;
}
return error;
}
static moduledata_t linux_elf_mod = {
"linuxelf",
linux_elf_modevent,

25
sys/i386/linux/linux_sysvec.c
View File

@ -794,40 +794,43 @@ linux_elf_modevent(module_t mod, int type, void *data)
++brandinfo)
if (elf_insert_brand_entry(*brandinfo) < 0)
error = EINVAL;
if (error)
printf("cannot insert Linux elf brand handler\n");
else {
linux_ioctl_register_handlers(&linux_ioctl_handler_set);
if (error == 0) {
linux_ioctl_register_handlers(
&linux_ioctl_handler_set);
if (bootverbose)
printf("Linux-ELF exec handler installed\n");
}
printf("Linux ELF exec handler installed\n");
} else
printf("cannot insert Linux ELF brand handler\n");
break;
case MOD_UNLOAD:
linux_ioctl_unregister_handlers(&linux_ioctl_handler_set);
for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL;
++brandinfo)
if (elf_brand_inuse(*brandinfo))
error = EBUSY;
if (error == 0) {
for (brandinfo = &linux_brandlist[0];
*brandinfo != NULL; ++brandinfo)
if (elf_remove_brand_entry(*brandinfo) < 0)
error = EINVAL;
}
if (error)
if (error == 0) {
linux_ioctl_unregister_handlers(
&linux_ioctl_handler_set);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
} else
printf("Could not deinstall ELF interpreter entry\n");
else if (bootverbose)
printf("Linux-elf exec handler removed\n");
break;
default:
break;
}
return error;
}
static moduledata_t linux_elf_mod = {
"linuxelf",
linux_elf_modevent,
0
};
DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);