bytecodealliance / wasmtime

A fast and secure runtime for WebAssembly
https://wasmtime.dev/
Apache License 2.0
15.11k stars 1.26k forks source link

mpk: memory image slots protection undoes any MPK protection #7942

Open abrown opened 7 months ago

abrown commented 7 months ago

While adding a test to check that the PKRU bits are properly switched out when each async fiber is suspended, I discovered that memory images are undoing the MPK protection applied to the memory pool. The fix is relatively simple: re-apply the MPK protection. But how we do so matters, since the memory image logic and MPK logic are completely separate at the moment.

Test Case

Initial draft at this branch; some manual tweaking required.

Steps to Reproduce

Expected Results

All of the single-page (64kB) slot memory is protected with the same MPK key.

Actual Results

Because the MPK protection is applied when the memory pool is instantiated, each instantiation of a new Wasm module containing image data will replace the MPK protection with generic key 0 protection when MemoryImageSlot::instantiate is called. When instantiating a single-page memory I discovered that the slot was split up with different keys instead of all the same key (e.g., key 1 used here):

Versions and Environment

Wasmtime version or commit: main Operating system: Linux Architecture: x64

Extra Info

One option here is to pass through an Option<ProtectionKey> to the MemoryImageSlot::instantiate function. Other suggestions?

abrown commented 7 months ago

cc: @alexcrichton

alexcrichton commented 7 months ago

To confirm, the problem here is that when a new mapping for a memory image is installed in the virtual address space that overwrites the pkey mapping previously configured? And the fix is to pkey_mprotect again? (want to make sure I understand first)