ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: fix the TrustZone VM entry path 

Commit 6a3368ee that refactored the mode transition assembler path, and
high-level entry point, fundamentally broke that part for the TrustZone VMs.
Instead of jumping to the appropriated address, the instruction value at that
point where used as target address.
Moreover, the TrustZone part of the mode transition page was not included into
the boundary check.

Ref #1182
This commit is contained in:
Stefan Kalkowski 2014-06-24 11:19:06 +02:00 committed by Norman Feske
parent 7b5237f9ff
commit a492366eea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/base-hw/src/core/arm_v7/mode_transition.s
View File

@ -455,10 +455,6 @@
/* apply user pc which implies application of spsr as user psr */
ldm sp, {pc}^
/* end of the mode transition code */
.global _mt_end
_mt_end:
/*
* On vm exceptions the CPU has to jump to one of the following
* 7 entry vectors to switch to a kernel context.
@ -488,3 +484,7 @@
.global _mt_vm_entry_pic
_mt_vm_entry_pic:
_kernel_to_vm
/* end of the mode transition code */
.global _mt_end
_mt_end:

2
repos/base-hw/src/core/kernel/pd.h
View File

@ -222,7 +222,7 @@ class Kernel::Mode_transition_control
void continue_vm(Cpu_state_modes * const context,
unsigned const processor_id)
{
_continue_client(context, processor_id, _mt_vm_entry_pic);
_continue_client(context, processor_id, (addr_t)&_mt_vm_entry_pic);
}
};