From patchwork Fri Apr 14 19:36:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=qLG2Li+H; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pymv42pntz1yXv for ; Sat, 15 Apr 2023 05:37:52 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF6DB385770D for ; Fri, 14 Apr 2023 19:37:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF6DB385770D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501069; bh=6nmf/22fLRPQ78OsbRCZybk7ZMzljvMRk1dJIVf5lDM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=qLG2Li+HoUGLGcF70Yd/PYXjbHC9lFxCoQAsBN1Nq7vjLFH0BmCupVZu0OXAFHXbp R+IajwRjTJf+jjpiS+jAgYr4cZEgdSTuBJwL5pv5Z5Ew/fJPh+B5PcYC39sajGpXxs xYfZ+3+/qeEfB9VUCPxafPsv1aEN+WBMNYBOz94o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id 844763858C54 for ; Fri, 14 Apr 2023 19:37:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 844763858C54 Received: by mail-lj1-x233.google.com with SMTP id by8so19863324ljb.13 for ; Fri, 14 Apr 2023 12:37:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501049; x=1684093049; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6nmf/22fLRPQ78OsbRCZybk7ZMzljvMRk1dJIVf5lDM=; b=Q3Cgvmet/kr9Ptft2C4LCtOMEWw78JCPJONLE2nFir4je6bePfFgxTDWfNPrzqXGBz IuGe3fBuGPHrPEcZIYpfmD5ZVVG4u0ivQljHhKYTXg3z42QQSjgLm79m3b8y9b6e2BgA Xc9CAlHxS3DmUOGM/tnA4wEfQiCXY3r+bdwKZ3Yp0qneBZXyKGPFW5sNLtO1oF6Qyxef pLeBDrc+2qnIBzZy/Q93yyND1hr9pesMVnd184X6j5//Hp7qReTEjJPCKhHolxBo6v5g V08F/rT9sii17G6I/39i726A5O8po50RvguT9dnhxJldVXEiKzK9Jl2LsjO6Q9p8uzTQ VenA== X-Gm-Message-State: AAQBX9cXH7z+KZLn19cPNSQCGN32r6riCz5NWBjNXlXXu70ibPBBrY9n TVICEnI1f3/lkw1iv5GvJU+xs03gi771Ow== X-Google-Smtp-Source: AKy350afOmbZx+KQ1IA9hCWg4Q86Ho4ecoX1CtcRCubSX8I6n6IyARDPKMtkPhzJDq4N4KDrkF7mYQ== X-Received: by 2002:a2e:864d:0:b0:2a7:7730:9da with SMTP id i13-20020a2e864d000000b002a7773009damr2396930ljj.7.1681501049104; Fri, 14 Apr 2023 12:37:29 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:28 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 1/5] hurd: Fix restoring reply port in sigreturn Date: Fri, 14 Apr 2023 22:36:56 +0300 Message-Id: <20230414193700.542116-1-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" We must not use the user's reply port (scp->sc_reply_port) for any of our own RPCs, otherwise various things break. So, use MACH_PORT_DEAD as a reply port when destroying our reply port, and make sure to do this after _hurd_sigstate_unlock (), which may do a gsync_wake () RPC. Signed-off-by: Sergey Bugaev --- sysdeps/mach/hurd/i386/sigreturn.c | 35 ++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c index 4f196710..a0fc8891 100644 --- a/sysdeps/mach/hurd/i386/sigreturn.c +++ b/sysdeps/mach/hurd/i386/sigreturn.c @@ -26,11 +26,29 @@ register int *sp asm ("%esp"); /* This is run on the thread stack after restoring it, to be able to unlock SS off sigstack. */ static void -__sigreturn2 (int *usp) +__sigreturn2 (int *usp, struct sigcontext *scp) { + mach_port_t reply_port; struct hurd_sigstate *ss = _hurd_self_sigstate (); _hurd_sigstate_unlock (ss); + /* Destroy the MiG reply port used by the signal handler, and restore the + reply port in use by the thread when interrupted. + + We cannot use the original reply port for our RPCs that we do here, since + we could unexpectedly receive/consume a reply message meant for the user + (in particular, msg_sig_post_reply), and also since we would deallocate + the port if *our* RPC fails, which we don't want to do since the user + still has the old name. And so, temporarily set MACH_PORT_DEAD as our + reply name, and make sure destroying the port is the very last RPC we + do. */ + reply_port = THREAD_GETMEM (THREAD_SELF, reply_port); + THREAD_SETMEM (THREAD_SELF, reply_port, MACH_PORT_DEAD); + if (MACH_PORT_VALID (reply_port)) + (void) __mach_port_mod_refs (__mach_task_self (), reply_port, + MACH_PORT_RIGHT_RECEIVE, -1); + THREAD_SETMEM (THREAD_SELF, reply_port, scp->sc_reply_port); + sp = usp; #define A(line) asm volatile (#line) /* The members in the sigcontext are arranged in this order @@ -58,7 +76,6 @@ __sigreturn (struct sigcontext *scp) { struct hurd_sigstate *ss; struct hurd_userlink *link = (void *) &scp[1]; - mach_port_t reply_port; if (scp == NULL || (scp->sc_mask & _SIG_CANT_MASK)) { @@ -98,13 +115,6 @@ __sigreturn (struct sigcontext *scp) if (scp->sc_onstack) ss->sigaltstack.ss_flags &= ~SS_ONSTACK; - /* Destroy the MiG reply port used by the signal handler, and restore the - reply port in use by the thread when interrupted. */ - reply_port = THREAD_GETMEM (THREAD_SELF, reply_port); - THREAD_SETMEM (THREAD_SELF, reply_port, scp->sc_reply_port); - if (MACH_PORT_VALID (reply_port)) - __mach_port_destroy (__mach_task_self (), reply_port); - if (scp->sc_fpused) /* Restore the FPU state. Mach conveniently stores the state in the format the i387 `frstor' instruction uses to restore it. */ @@ -115,15 +125,16 @@ __sigreturn (struct sigcontext *scp) copy the registers onto the user's stack, switch there, pop and return. */ - int *usp = (int *) scp->sc_uesp; + int usp_arg, *usp = (int *) scp->sc_uesp; *--usp = scp->sc_eip; *--usp = scp->sc_efl; memcpy (usp -= 12, &scp->sc_i386_thread_state, 12 * sizeof (int)); + usp_arg = (int) usp; + *--usp = (int) scp; /* Pass usp to __sigreturn2 so it can unwind itself easily. */ - *(usp-1) = (int) usp; - --usp; + *--usp = usp_arg; /* Bogus return address for __sigreturn2 */ *--usp = 0; *--usp = (int) __sigreturn2; From patchwork Fri Apr 14 19:36:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=KJZechFt; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pymv915fbz1yXv for ; Sat, 15 Apr 2023 05:37:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21EF83858C3A for ; Fri, 14 Apr 2023 19:37:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21EF83858C3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501075; bh=30roh4icvq9L8mKXAOex0w89Y//hxogxvOG8r3UDD6w=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KJZechFt3htCw8O4Kk9JVJ8NPiLAprKEEGEkzktc26egHqq3cbcENceMaoZxLntMS 04yjQyt1UntVkUAYBzNWMRv48TmnKSUsU++FKeBeBjDEH48uqXyjHdG4TXDpsluECr ZRITV5P0ZQsdNhkduHN4g8b1sz5ZyiDXywmNyb1c= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 3707C3858417 for ; Fri, 14 Apr 2023 19:37:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3707C3858417 Received: by mail-lj1-x234.google.com with SMTP id a29so20837740ljq.0 for ; Fri, 14 Apr 2023 12:37:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501055; x=1684093055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=30roh4icvq9L8mKXAOex0w89Y//hxogxvOG8r3UDD6w=; b=liMhP6PQxan4TgF7LBaQN/yYdAZPGW+E6LCV7qCOy+SxvaDhGyzYobXJkFLT5bkBOQ BmCuTgmw1rFfvUFJMhkM5ZOyHV3LzQswxv5b65m86h8xe/d79+xNVDn6i0D6SORUWWFm gLV7T2xpSgj83HgxiNHonezq1bfsu7Qou4mKNKgcK7yAeZ2a8dAH4agxfWmeqDODOYx9 LwntSF0jmOxBmnTG0W4pTaxINQ/0g1w8XiEhbpRpF5b2l2nOwxdMcxdpvA1zCo4ySzlL s/+Csab/G7nXjYvDIjMmug/KS28WZR8OutZ9n+S3uBppjRcL78HAU5qtENFPJXQvRgUq X+dw== X-Gm-Message-State: AAQBX9dMQONXCt/bEj4V68pXEbZ4mcHLys+R1PQifNuJnXZCFl81+Wio jPuEgN1jhc2GRIh0qXXiw8fPIci8RXybHQ== X-Google-Smtp-Source: AKy350bWsNrRHsmWbHrpJaGNpyROJ4JaJ+n+zIX3WGSZrdPufmVmh4JX0YSs0th1eGwn/Ccm0BEAkA== X-Received: by 2002:a2e:9811:0:b0:29b:e87:d851 with SMTP id a17-20020a2e9811000000b0029b0e87d851mr2178941ljj.1.1681501055171; Fri, 14 Apr 2023 12:37:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:34 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 2/5] hurd: Microoptimize sigreturn Date: Fri, 14 Apr 2023 22:36:57 +0300 Message-Id: <20230414193700.542116-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230414193700.542116-1-bugaevc@gmail.com> References: <20230414193700.542116-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev Signed-off-by: Sergey Bugaev --- I'll understand if this patch will be rejected, since this is not a hot path. But I just couldn't help myself when I saw what this was being compiled to! Much cleaner now. If you don't like THREAD_GETMEM (THREAD_SELF, _hurd_sigstate), we could have _hurd_self_sigstate_fast () or something. sysdeps/mach/hurd/i386/sigreturn.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c index a0fc8891..6ad8a998 100644 --- a/sysdeps/mach/hurd/i386/sigreturn.c +++ b/sysdeps/mach/hurd/i386/sigreturn.c @@ -29,7 +29,12 @@ static void __sigreturn2 (int *usp, struct sigcontext *scp) { mach_port_t reply_port; - struct hurd_sigstate *ss = _hurd_self_sigstate (); + struct hurd_sigstate *ss; + + /* We know the sigstate must be initialized, but the compiler does not. + Help it out a little bit by eliding the check that _hurd_self_sigstate + makes otherwise. */ + ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); _hurd_sigstate_unlock (ss); /* Destroy the MiG reply port used by the signal handler, and restore the @@ -44,7 +49,7 @@ __sigreturn2 (int *usp, struct sigcontext *scp) do. */ reply_port = THREAD_GETMEM (THREAD_SELF, reply_port); THREAD_SETMEM (THREAD_SELF, reply_port, MACH_PORT_DEAD); - if (MACH_PORT_VALID (reply_port)) + if (__glibc_likely (MACH_PORT_VALID (reply_port))) (void) __mach_port_mod_refs (__mach_task_self (), reply_port, MACH_PORT_RIGHT_RECEIVE, -1); THREAD_SETMEM (THREAD_SELF, reply_port, scp->sc_reply_port); @@ -69,6 +74,7 @@ __sigreturn2 (int *usp, struct sigcontext *scp) /* Firewall. */ A (hlt); #undef A + __builtin_unreachable (); } int @@ -77,13 +83,14 @@ __sigreturn (struct sigcontext *scp) struct hurd_sigstate *ss; struct hurd_userlink *link = (void *) &scp[1]; - if (scp == NULL || (scp->sc_mask & _SIG_CANT_MASK)) + if (__glibc_unlikely (scp == NULL || (scp->sc_mask & _SIG_CANT_MASK))) { errno = EINVAL; return -1; } - ss = _hurd_self_sigstate (); + /* Same as above, microoptimize _hurd_self_sigstate. */ + ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); _hurd_sigstate_lock (ss); /* Remove the link on the `active resources' chain added by From patchwork Fri Apr 14 19:36:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=cB45ttVp; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PymvF19gcz1yXv for ; Sat, 15 Apr 2023 05:38:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 26A753856DDC for ; Fri, 14 Apr 2023 19:37:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26A753856DDC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501079; bh=ZQiug4O6eJ2LOdLA42VmmyOL3weX817+HPwOyS1N4ZI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=cB45ttVpVQ3M+zsD/SkUp3q9gIf25YtPmPUVsJboZpUDVFt7zPSRoBQ9OBPL+bCo3 ec9GK+WG+t494xEbr0zr7Wn2I0BjQnBEdZppzxGBevRf0EzwBqthLgUkwBLJBEZx49 xg1YwMX1LVKXzAPygN0riQH7iiKdlkWIvKtKI4Gg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 62F743858C54 for ; Fri, 14 Apr 2023 19:37:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62F743858C54 Received: by mail-lj1-x234.google.com with SMTP id l7so5828068ljq.11 for ; Fri, 14 Apr 2023 12:37:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501058; x=1684093058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZQiug4O6eJ2LOdLA42VmmyOL3weX817+HPwOyS1N4ZI=; b=MhoaeWj9FLcSptCfsu2w5wAECDA2Z6aqFMU+SCO0cs36T0kOg4T5uLZ/bN+6W3SbLf PQqIzbV+jmJs1R7HDX2DKai2ZuWgD7XsUEE0+QDU/R+TOfCSQKUwFlRVKp8Cf6XB9WbI SqycfQzaTIvKl/h+pcOLMl7E3G1p4Aaas1cB8S1ESemU8FNxChaLihdiHokVwB27vDW8 j6ioRGCYRiQy4NpmphKIlUDV4q4mALgDWxgTxJCpYtfkgXgqZTV4vy8UycU3KFUyFIYy c7M48egh+/SerDkxzNzBH6fJ9Q4yD8ziY5Ud/XWgAcn7phQMmao69j+WZ6Q1bGVUtVNU Z+Kw== X-Gm-Message-State: AAQBX9c6/gtokN7FjwHYjma6v9nV3zaam2uMHEjeB4BucTLv1hCPatw+ 6pGLf8h/ii8jAyx+96QUU9I5S9MaF2K/KQ== X-Google-Smtp-Source: AKy350Y1qITlbMWIuoiJaGfbDzVpKZPDddLXKiQ8SGAIurYLpd/Ay7EnOQcPq/Cvi+U7jqL8iWpVOg== X-Received: by 2002:a05:651c:226:b0:293:591d:d84f with SMTP id z6-20020a05651c022600b00293591dd84fmr2327882ljn.11.1681501058707; Fri, 14 Apr 2023 12:37:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:38 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 3/5] hurd: Implement sigreturn for x86_64 Date: Fri, 14 Apr 2023 22:36:58 +0300 Message-Id: <20230414193700.542116-3-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230414193700.542116-1-bugaevc@gmail.com> References: <20230414193700.542116-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev --- This supersedes the previous version of this patch, and contains the same improvements the last two patches made to the i386 version. sysdeps/mach/hurd/x86_64/sigreturn.c | 166 +++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 sysdeps/mach/hurd/x86_64/sigreturn.c diff --git a/sysdeps/mach/hurd/x86_64/sigreturn.c b/sysdeps/mach/hurd/x86_64/sigreturn.c new file mode 100644 index 00000000..cba2eb77 --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/sigreturn.c @@ -0,0 +1,166 @@ +/* Copyright (C) 1991-2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +/* This is run on the thread stack after restoring it, to be able to + unlock SS off sigstack. */ +void +__sigreturn2 (struct hurd_sigstate *ss, uintptr_t *usp, + struct sigcontext *scp) +{ + mach_port_t reply_port; + _hurd_sigstate_unlock (ss); + + /* Destroy the MiG reply port used by the signal handler, and restore the + reply port in use by the thread when interrupted. + + We cannot use the original reply port for our RPCs that we do here, since + we could unexpectedly receive/consume a reply message meant for the user + (in particular, msg_sig_post_reply), and also since we would deallocate + the port if *our* RPC fails, which we don't want to do since the user + still has the old name. And so, temporarily set MACH_PORT_DEAD as our + reply name, and make sure destroying the port is the very last RPC we + do. */ + reply_port = THREAD_GETMEM (THREAD_SELF, reply_port); + THREAD_SETMEM (THREAD_SELF, reply_port, MACH_PORT_DEAD); + if (__glibc_likely (MACH_PORT_VALID (reply_port))) + (void) __mach_port_mod_refs (__mach_task_self (), reply_port, + MACH_PORT_RIGHT_RECEIVE, -1); + THREAD_SETMEM (THREAD_SELF, reply_port, scp->sc_reply_port); + + asm volatile ( + /* Point the stack to the register dump. */ + "movq %0, %%rsp\n" + /* Pop off the registers. */ + "popq %%r8\n" + "popq %%r9\n" + "popq %%r10\n" + "popq %%r11\n" + "popq %%r12\n" + "popq %%r13\n" + "popq %%r14\n" + "popq %%r15\n" + "popq %%rdi\n" + "popq %%rsi\n" + "popq %%rbp\n" + "popq %%rbx\n" + "popq %%rdx\n" + "popq %%rcx\n" + "popq %%rax\n" + "popfq\n" + /* Restore %rip and %rsp with a single instruction. */ + "retq $128" : + : "rm" (usp)); + __builtin_unreachable (); +} + +int +__sigreturn (struct sigcontext *scp) +{ + struct hurd_sigstate *ss; + struct hurd_userlink *link = (void *) &scp[1]; + mach_port_t reply_port; + + if (__glibc_unlikely (scp == NULL || (scp->sc_mask & _SIG_CANT_MASK))) + { + errno = EINVAL; + return -1; + } + + /* We know the sigstate must be initialized, but the compiler does not. + Help it out a little bit by eliding the check that _hurd_self_sigstate + makes otherwise. */ + ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); + _hurd_sigstate_lock (ss); + + /* Remove the link on the `active resources' chain added by + _hurd_setup_sighandler. Its purpose was to make sure + that we got called; now we have, it is done. */ + _hurd_userlink_unlink (link); + + /* Restore the set of blocked signals, and the intr_port slot. */ + ss->blocked = scp->sc_mask; + ss->intr_port = scp->sc_intr_port; + + /* Check for pending signals that were blocked by the old set. */ + if (_hurd_sigstate_pending (ss) & ~ss->blocked) + { + /* There are pending signals that just became unblocked. Wake up the + signal thread to deliver them. But first, squirrel away SCP where + the signal thread will notice it if it runs another handler, and + arrange to have us called over again in the new reality. */ + ss->context = scp; + _hurd_sigstate_unlock (ss); + __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ()); + /* If a pending signal was handled, sig_post never returned. + If it did return, the pending signal didn't run a handler; + proceed as usual. */ + _hurd_sigstate_lock (ss); + ss->context = NULL; + } + + if (scp->sc_onstack) + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; + + if (scp->sc_fpused) + /* Restore the FPU state. Mach conveniently stores the state + in the format the i387 `frstor' instruction uses to restore it. */ + asm volatile ("frstor %0" : : "m" (scp->sc_fpsave)); + + { + /* There are convenient instructions to pop state off the stack, so we + copy the registers onto the user's stack, switch there, pop and + return. */ + + uintptr_t *usp = (uintptr_t *) scp->sc_ursp - 128; + + *--usp = scp->sc_rip; + *--usp = scp->sc_rfl; + *--usp = scp->sc_rax; + *--usp = scp->sc_rcx; + *--usp = scp->sc_rdx; + *--usp = scp->sc_rbx; + *--usp = scp->sc_rbp; + *--usp = scp->sc_rsi; + *--usp = scp->sc_rdi; + *--usp = scp->sc_r15; + *--usp = scp->sc_r14; + *--usp = scp->sc_r13; + *--usp = scp->sc_r12; + *--usp = scp->sc_r11; + *--usp = scp->sc_r10; + *--usp = scp->sc_r9; + *--usp = scp->sc_r8; + + /* Switch to the user's stack that we have just prepared, and call + __sigreturn2. Clobber "memory" to make sure GCC flushes the stack + setup to actual memory. We align the stack as per the ABI, but pass + the original usp to __sigreturn2 as an argument. */ + asm volatile ("movq %1, %%rsp\n" + "andq $-16, %%rsp\n" + "call __sigreturn2" : + : "D" (ss), "S" (usp), "d" (scp) + : "memory"); + __builtin_unreachable (); + } +} + +weak_alias (__sigreturn, sigreturn) From patchwork Fri Apr 14 19:36:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=swHbFYQx; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pymvt6h6xz1yXv for ; Sat, 15 Apr 2023 05:38:34 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2CE03856969 for ; Fri, 14 Apr 2023 19:38:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2CE03856969 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501112; bh=7SxeYFb+BoMfau5ehctR7QSthQ7j4PwQVvkBRLbtbgA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=swHbFYQxCpJu737N2smpZ4iwzFLyTlUPNbquvDstoRN9V/sEVjtSmO2HqynhkdIsE HdLSAJzt6iB3R8zUu5BGKDnWV+OyA2BpMC68A/Z0ReiYrj1zkR82qwTwqsCQzDvqZB cUvL/fozBp7Xgs+Jq1igKmXGmqid0pU+mtZj/uXg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id ED63A385842D for ; Fri, 14 Apr 2023 19:37:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED63A385842D Received: by mail-lj1-x22e.google.com with SMTP id h8so4148130ljf.3 for ; Fri, 14 Apr 2023 12:37:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501062; x=1684093062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7SxeYFb+BoMfau5ehctR7QSthQ7j4PwQVvkBRLbtbgA=; b=QVIRWGlxYRz59ufau/qj63XZCHRsAo3xyasZuZD/qaZFGpzFmd1GNshG1JgJUOiH3I pqOatLX5vaFKAkxBD8yTsQkweweyXAJH24F4NrmxLyZCbCTvOdXk2hplImRolCG0q4mA 45XjW7OSB96+XWm8Ry4rH88wA5XS3eJsHsVkqa/ugi5z6sXesfcx+oxOLQjeHMpineXn IaP9qhlNwSq6yPnED3QnF+qfL9RW3O6ZIZsokQdVgvngdJoDnsrhl14HuxDegx06RCB7 5J28jOLPTfvefPfDuSwQPuc5DwsFI4Xf74K8LE/j8BXX7miG5WY6Pvv11BB+YpAJg1uA PzRA== X-Gm-Message-State: AAQBX9euZdGddqekRp885MtpGpvfYQYhKAXtd01Ylrm0nTqq3YNHS85s PdK9XPjd6B6Zv2Fc0zDUkwJwBlj4zXZ58w== X-Google-Smtp-Source: AKy350bKIs7qoQoGkdiOHNBrVI6XWrMRyBI/Q9FLOx7+M3TPQdtrGAxoZkIyN84u4Y6Ppu099+j8DA== X-Received: by 2002:a2e:9ccb:0:b0:293:4c17:9998 with SMTP id g11-20020a2e9ccb000000b002934c179998mr2423032ljj.11.1681501062240; Fri, 14 Apr 2023 12:37:42 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:41 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 4/5] hurd: Simplify _S_catch_exception_raise Date: Fri, 14 Apr 2023 22:36:59 +0300 Message-Id: <20230414193700.542116-4-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230414193700.542116-1-bugaevc@gmail.com> References: <20230414193700.542116-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" _hurd_thread_sigstate () already handles finding an existing sigstate before allocating a new one, so just use that. Bonus: this will only lock the _hurd_siglock once. Signed-off-by: Sergey Bugaev --- hurd/catch-exc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c index 5ee2233a..d375bf67 100644 --- a/hurd/catch-exc.c +++ b/hurd/catch-exc.c @@ -58,13 +58,7 @@ _S_catch_exception_raise (mach_port_t port, _hurd_exception2signal (&d, &signo); /* Find the sigstate structure for the faulting thread. */ - __mutex_lock (&_hurd_siglock); - for (ss = _hurd_sigstates; ss != NULL; ss = ss->next) - if (ss->thread == thread) - break; - __mutex_unlock (&_hurd_siglock); - if (ss == NULL) - ss = _hurd_thread_sigstate (thread); /* Allocate a fresh one. */ + ss = _hurd_thread_sigstate (thread); if (__spin_lock_locked (&ss->lock)) { From patchwork Fri Apr 14 19:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=xwEWtSg8; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pymwh51bpz1yXv for ; Sat, 15 Apr 2023 05:39:16 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4E073856DD7 for ; Fri, 14 Apr 2023 19:39:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4E073856DD7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501154; bh=hC6qHPyKnhgBmsTUzaqPU5RWtz9ZWbc5fqX5x03OlRI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=xwEWtSg8f39QCq59SBDTdhRMk504WDhS13FfiWMrnPKOVi6cpMZy9iQ6KfYiDIUyv ERMa0aCsd7DysGAmAwk4nFLY8exBVXUfTQ59TuYJeXB3hqS1MlzRf2I+Ih2cNVUQTP L3Wtfa6SZiX8Y7x8H9SpFuUcVu6UXMqrTazbEgCQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by sourceware.org (Postfix) with ESMTPS id 700F23857726 for ; Fri, 14 Apr 2023 19:37:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 700F23857726 Received: by mail-lj1-x235.google.com with SMTP id r9so6299670ljp.9 for ; Fri, 14 Apr 2023 12:37:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501064; x=1684093064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hC6qHPyKnhgBmsTUzaqPU5RWtz9ZWbc5fqX5x03OlRI=; b=hQ3BD8IPnlVPzo32YjE/GvVeEFOGdXcl2ZZqt/Keew6I+1OD4dDi7WHqVEBjFNzvBi eSq6n/U/HPcPRuUscSvtyCWJbmqAeCQBgciIv3NdknzIqTN6d5XMMS4wnsAh8/D9ofxa ifsuNFI5m9yTXeVdTj4c9C36dSz9491DIeZ2nXMsbL4n9IGm+y/0ombuVBHsPHvKgvkS VBI54K+6A+TuX316n09JpUE4rBAQlswya2yFubDCNh3Ahk0FqbbHJDAiPAZQ7g7n6drZ rEdlnqfVP0r3xsAo7R6BNk8Hi62GSijqYHKS2I3T9KR6+nFjpGUyh1wRJGR3p8ebSQ9b gE0w== X-Gm-Message-State: AAQBX9cgDtxB5xyTHqYI6ANku5wJ6HyOPPEE5cyIDiMNhRvUMl0oofqZ m0FPSSCRYaoA1qSssY0CJAz+BLCwiiK+0g== X-Google-Smtp-Source: AKy350ZAnVFawewjHBvkWBLAKEef/R87OpehzndEI0SpvI5b+D/lQKDDxEr3lsOwHsYOQCv4TfN3mQ== X-Received: by 2002:a2e:8186:0:b0:2a7:b163:6a40 with SMTP id e6-20020a2e8186000000b002a7b1636a40mr2306018ljg.12.1681501064504; Fri, 14 Apr 2023 12:37:44 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:43 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 5/5] hurd: Avoid leaking task & thread ports Date: Fri, 14 Apr 2023 22:37:00 +0300 Message-Id: <20230414193700.542116-5-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230414193700.542116-1-bugaevc@gmail.com> References: <20230414193700.542116-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev --- hurd/catch-exc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c index d375bf67..bec850f9 100644 --- a/hurd/catch-exc.c +++ b/hurd/catch-exc.c @@ -35,6 +35,7 @@ _S_catch_exception_raise (mach_port_t port, #endif ) { + error_t err; struct hurd_sigstate *ss; int signo; struct hurd_signal_detail d; @@ -83,6 +84,11 @@ _S_catch_exception_raise (mach_port_t port, MACH_PORT_NULL, MACH_MSG_TYPE_PORT_SEND, 0); + err = __mach_port_deallocate (__mach_task_self (), task); + assert_perror (err); + err = __mach_port_deallocate (__mach_task_self (), thread); + assert_perror (err); + return KERN_SUCCESS; }