gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcctrl: fix NULL pointer dereference for unbooted OS instance shutdown

Browse Source
This commit is contained in:
Balazs Gerofi
2016-10-26 14:50:07 +09:00
parent f284a80656
commit 059fab2cc0
5 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
executer/kernel/mcctrl/driver.c
View File

@@ -129,11 +129,15 @@ error_cleanup_channels:
int mcctrl_os_shutdown_notifier(int os_index)
{
sysfsm_cleanup(os[os_index]);
free_topology_info(os[os_index]);
ihk_os_unregister_user_call_handlers(os[os_index], mcctrl_uc + os_index);
destroy_ikc_channels(os[os_index]);
procfs_exit(os_index);
if (os[os_index]) {
sysfsm_cleanup(os[os_index]);
free_topology_info(os[os_index]);
ihk_os_unregister_user_call_handlers(os[os_index], mcctrl_uc + os_index);
destroy_ikc_channels(os[os_index]);
procfs_exit(os_index);
}
os[os_index] = NULL;
printk("mcctrl: OS ID %d shutdown event handled\n", os_index);
return 0;
@@ -151,11 +155,16 @@ static struct ihk_os_notifier mcctrl_os_notifier = {
static int __init mcctrl_init(void)
{
int ret = 0;
int i;
#ifndef DO_USER_MODE
mcctrl_syscall_init();
#endif
for (i = 0; i < OS_MAX_MINOR; ++i) {
os[i] = NULL;
}
rus_page_hash_init();
binfmt_mcexec_init();