From patchwork Mon Apr 21 17:44:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 110764 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CD5E3858C50 for ; Mon, 21 Apr 2025 17:45:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CD5E3858C50 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 9499E3858D37 for ; Mon, 21 Apr 2025 17:44:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9499E3858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9499E3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745257498; cv=none; b=ucgudGeKM3tZ+jpkzRQGlWhTwKcOZu04K2JhNF5fqK0Zc6HpwUNYESRfENXF7olcMU6a/k2nNGMPlzlDb7MRxSzegreEmPVon0sHWmKz3GOysLtuq0vcbD9z3TtLktzhqVwLy7Stj0djW3Y2ZEV9Kqnngnc3wwdtkRiSnjf6g8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745257498; c=relaxed/simple; bh=D0Xwqq7YcqoVpasw1FBhDpPpn8revLOeqIPI3Gq+4vs=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=rypV/llf81vyuvnkinZvO9SrZhFaNgrM6wr9jCS+xFt0+0TA+PaAFD6LlT0zc2s3sAJlkVnX5IxCxN9J0g+DCzUgIq/JP1ofgJKnZLYoYZhvFVy6KGwgXlYcfHWj74nsplmzgemF+RqHWdiH3bHYkQdvLu4U0C8praG1XGxyBb0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9499E3858D37 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 65FA6A493C; Mon, 21 Apr 2025 19:44:57 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1a-hOTNGTS1T; Mon, 21 Apr 2025 19:44:57 +0200 (CEST) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 42A45A4938; Mon, 21 Apr 2025 19:44:57 +0200 (CEST) Received: from samy by begin with local (Exim 4.98.2) (envelope-from ) id 1u6vCS-0000000Ea4P-30Kn; Mon, 21 Apr 2025 19:44:56 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] hurd: Do not restore xstate when it is not initialized Date: Mon, 21 Apr 2025 19:44:48 +0200 Message-ID: <20250421174448.3475230-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org 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. --- 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 37fa984070..dc57d6122c 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 dff8e76dc8..773c00f86d 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