From 72a662d18ad2eb028a566276f06d12a7abdca350 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Wed, 18 Jun 2025 06:49:31 +0200 Subject: [PATCH] git-xstate-initialized commit 8d54b428cfe98c21049f94c8af3bf302e44091e9 Author: Samuel Thibault Date: Mon Apr 21 19:42:27 2025 +0200 hurd: Do not restore xstate when it is not initialized If the process has never used fp before getting a signal, xstate is set (and thus the x87 state is not initialized) but xstate->initialized is still 0, and we should not restore anything. Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name git-xstate-initialized.diff --- sysdeps/mach/hurd/i386/sigreturn.c | 37 +++++++++++++++------------- sysdeps/mach/hurd/x86_64/sigreturn.c | 37 +++++++++++++++------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c index 37fa98407..dc57d6122 100644 --- a/sysdeps/mach/hurd/i386/sigreturn.c +++ b/sysdeps/mach/hurd/i386/sigreturn.c @@ -126,24 +126,27 @@ __sigreturn (struct sigcontext *scp) ss->sigaltstack.ss_flags &= ~SS_ONSTACK; #ifdef i386_XFLOAT_STATE - if ((scp->xstate) && (scp->xstate->initialized)) + if (scp->xstate) { - unsigned eax, ebx, ecx, edx; - __cpuid_count(0xd, 0, eax, ebx, ecx, edx); - switch (scp->xstate->fp_save_kind) - { - case 0: // FNSAVE - asm volatile("frstor %0" : : "m" (scp->xstate->hw_state)); - break; - case 1: // FXSAVE - asm volatile("fxrstor %0" : : "m" (scp->xstate->hw_state), \ - "a" (eax), "d" (edx)); - break; - default: // XSAVE, XSAVEOPT, XSAVEC, XSAVES - asm volatile("xrstor %0" : : "m" (scp->xstate->hw_state), \ - "a" (eax), "d" (edx)); - break; - } + if (scp->xstate->initialized) + { + unsigned eax, ebx, ecx, edx; + __cpuid_count(0xd, 0, eax, ebx, ecx, edx); + switch (scp->xstate->fp_save_kind) + { + case 0: // FNSAVE + asm volatile("frstor %0" : : "m" (scp->xstate->hw_state)); + break; + case 1: // FXSAVE + asm volatile("fxrstor %0" : : "m" (scp->xstate->hw_state), \ + "a" (eax), "d" (edx)); + break; + default: // XSAVE, XSAVEOPT, XSAVEC, XSAVES + asm volatile("xrstor %0" : : "m" (scp->xstate->hw_state), \ + "a" (eax), "d" (edx)); + break; + } + } } else #endif diff --git a/sysdeps/mach/hurd/x86_64/sigreturn.c b/sysdeps/mach/hurd/x86_64/sigreturn.c index dff8e76dc..773c00f86 100644 --- a/sysdeps/mach/hurd/x86_64/sigreturn.c +++ b/sysdeps/mach/hurd/x86_64/sigreturn.c @@ -119,24 +119,27 @@ __sigreturn (struct sigcontext *scp) ss->sigaltstack.ss_flags &= ~SS_ONSTACK; #ifdef i386_XFLOAT_STATE - if ((scp->xstate) && (scp->xstate->initialized)) + if (scp->xstate) { - unsigned eax, ebx, ecx, edx; - __cpuid_count(0xd, 0, eax, ebx, ecx, edx); - switch (scp->xstate->fp_save_kind) - { - case 0: // FNSAVE - asm volatile("frstor %0" : : "m" (scp->xstate->hw_state)); - break; - case 1: // FXSAVE - asm volatile("fxrstor %0" : : "m" (scp->xstate->hw_state), \ - "a" (eax), "d" (edx)); - break; - default: // XSAVE, XSAVEOPT, XSAVEC, XSAVES - asm volatile("xrstor %0" : : "m" (scp->xstate->hw_state), \ - "a" (eax), "d" (edx)); - break; - } + if (scp->xstate->initialized) + { + unsigned eax, ebx, ecx, edx; + __cpuid_count(0xd, 0, eax, ebx, ecx, edx); + switch (scp->xstate->fp_save_kind) + { + case 0: // FNSAVE + asm volatile("frstor %0" : : "m" (scp->xstate->hw_state)); + break; + case 1: // FXSAVE + asm volatile("fxrstor %0" : : "m" (scp->xstate->hw_state), \ + "a" (eax), "d" (edx)); + break; + default: // XSAVE, XSAVEOPT, XSAVEC, XSAVES + asm volatile("xrstor %0" : : "m" (scp->xstate->hw_state), \ + "a" (eax), "d" (edx)); + break; + } + } } else #endif -- 2.30.2