mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: PKRU should affect only user-mode memory accesses (bug in page translation)

Browse Source
This commit is contained in:
Stanislav Shwartsman 2019-12-04 17:27:57 +00:00
parent 4aad922419
commit 951361a3a5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/cpu/paging.cc
View File

@ -758,21 +758,25 @@ bx_phy_address BX_CPU_C::translate_linear_long_mode(bx_address laddr, Bit32u &lp
(combined_access | isWrite); // bit 2,1,0
#if BX_SUPPORT_PKEYS
if (BX_CPU_THIS_PTR cr4.get_PKE()) {
if (BX_CPU_THIS_PTR cr4.get_PKE() && user) {
pkey = (entry[leaf] >> 59) & 0xf;
if (rw != BX_EXECUTE) {
// check of accessDisable bit set
if (BX_CPU_THIS_PTR pkru & (1<<(pkey*2)))
if (BX_CPU_THIS_PTR pkru & (1<<(pkey*2))) {
BX_ERROR(("PAE: protection key access not allowed PKRU=%x pkey=%d", BX_CPU_THIS_PTR pkru, pkey));
page_fault(ERROR_PROTECTION | ERROR_PKEY, laddr, user, rw);
}
// check of writeDisable bit set
if (BX_CPU_THIS_PTR pkru & (1<<(pkey*2+1))) {
if (isWrite && (user || BX_CPU_THIS_PTR cr0.get_WP()))
if (isWrite && (user || BX_CPU_THIS_PTR cr0.get_WP())) {
BX_ERROR(("PAE: protection key write not allowed PKRU=%x pkey=%d", BX_CPU_THIS_PTR pkru, pkey));
page_fault(ERROR_PROTECTION | ERROR_PKEY, laddr, user, rw);
}
}
}
}
#endif
if (!priv_check[priv_index] || nx_fault)