ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/i386: Honor xfeatures in xrstor_sigcontext 

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-08 14:51:54 -10:00
parent a7365e984d
commit 7973eb943e
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linux-user/i386/signal.c
View File

@ -613,6 +613,7 @@ static bool xrstor_sigcontext(CPUX86State *env, FPStateKind fpkind,
struct target_fpx_sw_bytes *sw = (void *)&fxstate->sw_reserved; struct target_fpx_sw_bytes *sw = (void *)&fxstate->sw_reserved;
uint32_t magic1, magic2; uint32_t magic1, magic2;
uint32_t extended_size, xstate_size, min_size, max_size; uint32_t extended_size, xstate_size, min_size, max_size;
uint64_t xfeatures;
switch (fpkind) { switch (fpkind) {
case FPSTATE_XSAVE: case FPSTATE_XSAVE:
@ -629,10 +630,25 @@ static bool xrstor_sigcontext(CPUX86State *env, FPStateKind fpkind,
xstate_size > extended_size) { xstate_size > extended_size) {
break; break;
} }
/*
* Restore the features indicated in the frame, masked by
* those currently enabled. Re-check the frame size.
* ??? It is not clear where the kernel does this, but it
* is not in check_xstate_in_sigframe, and so (probably)
* does not fall back to fxrstor.
*/
xfeatures = tswap64(sw->xfeatures) & env->xcr0;
min_size = xsave_area_size(xfeatures, false);
if (xstate_size < min_size) {
return false;
}
if (!access_ok(env_cpu(env), VERIFY_READ, fxstate_addr, if (!access_ok(env_cpu(env), VERIFY_READ, fxstate_addr,
xstate_size + TARGET_FP_XSTATE_MAGIC2_SIZE)) { xstate_size + TARGET_FP_XSTATE_MAGIC2_SIZE)) {
return false; return false;
} }
/* /*
* Check for the presence of second magic word at the end of memory * Check for the presence of second magic word at the end of memory
* layout. This detects the case where the user just copied the legacy * layout. This detects the case where the user just copied the legacy
@ -645,7 +661,8 @@ static bool xrstor_sigcontext(CPUX86State *env, FPStateKind fpkind,
if (magic2 != TARGET_FP_XSTATE_MAGIC2) { if (magic2 != TARGET_FP_XSTATE_MAGIC2) {
break; break;
} }
cpu_x86_xrstor(env, fxstate_addr, -1);
cpu_x86_xrstor(env, fxstate_addr, xfeatures);
return true; return true;
default: default: