OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-arm: fix vmsav6 access control 

Override access control checks (including execute) for mmu translation
table descriptors assigned to manager domains.

Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Juha Riihimäki 2010-12-08 13:15:16 +02:00 committed by Aurelien Jarno
parent a5d88f3e03
commit c003432809
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
target-arm/helper.c
View File

@ -1084,22 +1084,26 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type,
} }
code = 15; code = 15;
} }
if (xn && access_type == 2) if (domain == 3) {
goto do_fault; *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
} else {
if (xn && access_type == 2)
goto do_fault;
/* The simplified model uses AP[0] as an access control bit. */ /* The simplified model uses AP[0] as an access control bit. */
if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) { if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) {
/* Access flag fault. */ /* Access flag fault. */
code = (code == 15) ? 6 : 3; code = (code == 15) ? 6 : 3;
goto do_fault; goto do_fault;
} }
*prot = check_ap(env, ap, domain, access_type, is_user); *prot = check_ap(env, ap, domain, access_type, is_user);
if (!*prot) { if (!*prot) {
/* Access permission fault. */ /* Access permission fault. */
goto do_fault; goto do_fault;
} }
if (!xn) { if (!xn) {
*prot |= PAGE_EXEC; *prot |= PAGE_EXEC;
}
} }
*phys_ptr = phys_addr; *phys_ptr = phys_addr;
return 0; return 0;