Merge pull request #1937 from ved-rivos/0317

aswaterman · web-flow · commit 3c61a0f41ed5 · 2025-03-17T16:08:15.000-07:00
Shadow stack inst should cause samo access fault
diff --git a/riscv/mmu.cc b/riscv/mmu.cc
@@ -65,7 +65,7 @@ reg_t mmu_t::translate(mem_access_info_t access_info, reg_t len)
 
   reg_t paddr = walk(access_info) | (addr & (PGSIZE-1));
   if (!pmp_ok(paddr, len, access_info.flags.ss_access ? STORE : type, mode, access_info.flags.hlvx))
-    throw_access_exception(virt, addr, type);
+    throw_access_exception(virt, addr, access_info.flags.ss_access ? STORE : type);
   return paddr;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ reg_t mmu_t::translate(mem_access_info_t access_info, reg_t len)`
`65`	`65`
`66`	`66`	`reg_t paddr = walk(access_info) \| (addr & (PGSIZE-1));`
`67`	`67`	`if (!pmp_ok(paddr, len, access_info.flags.ss_access ? STORE : type, mode, access_info.flags.hlvx))`
`68`		`- throw_access_exception(virt, addr, type);`
	`68`	`+ throw_access_exception(virt, addr, access_info.flags.ss_access ? STORE : type);`
`69`	`69`	`return paddr;`
`70`	`70`	`}`
`71`	`71`