From patchwork Sat Apr 29 13:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68542 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 859BE3858431 for ; Sat, 29 Apr 2023 13:14:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 859BE3858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774059; bh=QtVwqsqQuRS61th3GZO1nYlIJWswXNR9eE5lGLNdgm8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=gxoAesX6klfI2LkMJmsVmNQ4TCqGekYA6kX5PFj1KIloehoKkhyqKBKqv9A7q7c8/ IKMUDO3vbKNbjZY2RNrskSWpEWeYDgxpiJeuM0YFXxRwpqPIVgNnOh9BmbJokdiKGK ElvvJmlE6avSjhdGkf9JGbFBegZjeIoZrFyVyzLM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 2DA743858C50 for ; Sat, 29 Apr 2023 13:13:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DA743858C50 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4effb818c37so1059319e87.3 for ; Sat, 29 Apr 2023 06:13:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774036; x=1685366036; 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=QtVwqsqQuRS61th3GZO1nYlIJWswXNR9eE5lGLNdgm8=; b=PPnQLBpYZIVKuhZDchVm4Cub+1ltk+neqcPLbPnUrQeVkJScHHAOnRevagDLBv3FMy LrdEFSOuGDIG870e8H1yfs4msdJoyBCWGMHwuWgXX+wktFEGJqGLBhNC4NnMvTjKMsbu MwStvVzhIISKC7QMYzcGZU6iCITHb6AcIs1p7JZbWARgxjDPflpRE08rrVc/DxJBGyMW jJ6jGzAoUUf6q8Q/AmMzKc8KsrUBvzvcFPRS5grwQFB75jbUIe8O8kPXVwAop0EVdIt1 YvI/LbIRi34aEJ5LyywWYwWgfXuCOtYZvFSNQwzGLlSWneMb/zRVcg+x6Ka7aJE+3uKx EpBg== X-Gm-Message-State: AC+VfDxffUtJPrLs5LTiPm9OKpQHj3+SRrIrRzzwv+mSQC6RgnxxR/5C zxoedHYSWUPrJXLxL/lPdk+AJZDiQApG/Q== X-Google-Smtp-Source: ACHHUZ68OPn5V/jfE6txOC1jcEuMfSLFraCN1sQJsIp1FRSytAN6L3p0tmjtRyonKxpVhrOJ1APFLA== X-Received: by 2002:a19:a410:0:b0:4db:456a:9a1 with SMTP id q16-20020a19a410000000b004db456a09a1mr2576511lfc.66.1682774036025; Sat, 29 Apr 2023 06:13:56 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:13:55 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 1/7] hurd: Simplify _hurd_critical_section_lock a bit Date: Sat, 29 Apr 2023 16:13:48 +0300 Message-Id: <20230429131354.2507443-1-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This block of code was doing exactly what _hurd_self_sigstate does; so just call that and let it do its job. Signed-off-by: Sergey Bugaev --- hurd/hurd/signal.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 662e955e..302ca25e 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -218,19 +218,7 @@ _hurd_critical_section_lock (void) return NULL; #endif - ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); - if (ss == NULL) - { - thread_t self = __mach_thread_self (); - - /* The thread variable is unset; this must be the first time we've - asked for it. In this case, the critical section flag cannot - possible already be set. Look up our sigstate structure the slow - way. */ - ss = _hurd_thread_sigstate (self); - THREAD_SETMEM (THREAD_SELF, _hurd_sigstate, ss); - __mach_port_deallocate (__mach_task_self (), self); - } + ss = _hurd_self_sigstate (); if (! __spin_try_lock (&ss->critical_section_lock)) /* We are already in a critical section, so do nothing. */ From patchwork Sat Apr 29 13:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68543 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 4B4B8385700F for ; Sat, 29 Apr 2023 13:14:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B4B8385700F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774062; bh=e/4kHgS4eq3VRSTYtybNAaxVSrKUW2DssEM8aUPTjc8=; 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=bllFIkSvbx/0ePg7cHs68VECkah65jkDPAS5GcGFYBjPIRL5I+2Vy6PF/KC/qCB1+ hYk+h6CmX/fZDo2J8MZuuXvZA4ZiUK8A7RGGKDDXf4CobJ5behyHcdgx0ueb+ez1DE USZyfaQY9VJ1O5t+oJBBKfi/tkvUOXa/gsTaXkHg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id D0B4B3858C54 for ; Sat, 29 Apr 2023 13:13:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0B4B3858C54 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4effb818c37so1059333e87.3 for ; Sat, 29 Apr 2023 06:13:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774037; x=1685366037; 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=e/4kHgS4eq3VRSTYtybNAaxVSrKUW2DssEM8aUPTjc8=; b=hTsP+mybmKstGBlhm6+oGmaCB8tIQNwDwmOo6EpWtVZcucGdlrer3PEkd6WIU/RQC1 t7ra6UKkgcaz8MHCp5y8PY9Tk4gJQnQ0BgAtUvNHZ+/lseCKS1GGV1D/PPLmq039oE/J P26721CP6UZxu83gI2JuvdDPCdW9IjcCD4u91pn1oQ2v9w4rjdChyxzaxYg2mVYdOumm R1O2pEjeUvC9MiIBfRClSk4y/6i1ftqFezRy8AXGjhljLeU86oGS+vlgLOIoMQ7ORK7L 5M93fULq/Vnlswc2Y0yVsaQkZ9rC4O4Od14FJ2t8xCrFWQrWRtIEb1LLmVVs287aE8Sz OaLA== X-Gm-Message-State: AC+VfDyprUXd95YmiO7nEi12/uTpEOUroVrX7l6C75GHVdO77Vj0eHAX TPI3o5QyywUUmbCS95n/ejd5FYjRBsGa0w== X-Google-Smtp-Source: ACHHUZ7Y90PybLFHL5Q4YxOWLYAylBpRZ3N0+L+WAwXQTPwBiaqOfjRpwCNzgvA3+0EDrra43ANatQ== X-Received: by 2002:ac2:5930:0:b0:4ef:ec33:9155 with SMTP id v16-20020ac25930000000b004efec339155mr2408166lfi.28.1682774036899; Sat, 29 Apr 2023 06:13:56 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:13:56 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 2/7] hurd: Move libc_hidden_def's around Date: Sat, 29 Apr 2023 16:13:49 +0300 Message-Id: <20230429131354.2507443-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Each libc_hidden_def should be placed immediately next to its function, not in some random unrelated place. No functional change. Fixes: 653d74f12abea144219af00400ed1f1ac5dfa79f "hurd: Global signal disposition" Signed-off-by: Sergey Bugaev --- hurd/hurdsig.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index c84de4db..78ea59d9 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -174,6 +174,7 @@ _hurd_sigstate_set_global_rcv (struct hurd_sigstate *ss) assert (ss->thread != MACH_PORT_NULL); ss->actions[0].sa_handler = SIG_IGN; } +libc_hidden_def (_hurd_sigstate_set_global_rcv) /* Check whether SS is a global receiver. */ static int @@ -193,6 +194,8 @@ _hurd_sigstate_lock (struct hurd_sigstate *ss) __spin_lock (&_hurd_global_sigstate->lock); __spin_lock (&ss->lock); } +libc_hidden_def (_hurd_sigstate_lock) + void _hurd_sigstate_unlock (struct hurd_sigstate *ss) { @@ -200,7 +203,7 @@ _hurd_sigstate_unlock (struct hurd_sigstate *ss) if (sigstate_is_global_rcv (ss)) __spin_unlock (&_hurd_global_sigstate->lock); } -libc_hidden_def (_hurd_sigstate_set_global_rcv) +libc_hidden_def (_hurd_sigstate_unlock) /* Retrieve a thread's full set of pending signals, including the global ones if appropriate. SS must be locked. */ @@ -212,6 +215,7 @@ _hurd_sigstate_pending (const struct hurd_sigstate *ss) __sigorset (&pending, &pending, &_hurd_global_sigstate->pending); return pending; } +libc_hidden_def (_hurd_sigstate_pending) /* Clear a pending signal and return the associated detailed signal information. SS must be locked, and must have signal SIGNO @@ -230,8 +234,6 @@ sigstate_clear_pending (struct hurd_sigstate *ss, int signo) __sigdelset (&ss->pending, signo); return ss->pending_data[signo]; } -libc_hidden_def (_hurd_sigstate_lock) -libc_hidden_def (_hurd_sigstate_unlock) /* Retrieve a thread's action vector. SS must be locked. */ struct sigaction * @@ -242,7 +244,6 @@ _hurd_sigstate_actions (struct hurd_sigstate *ss) else return ss->actions; } -libc_hidden_def (_hurd_sigstate_pending) /* Signal delivery itself is on this page. */ From patchwork Sat Apr 29 13:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68544 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 AC0243856962 for ; Sat, 29 Apr 2023 13:14:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC0243856962 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774064; bh=p1L8QPGACgmes4wtZgddLp/fG1aOjQ4PWzv8KkAi66Q=; 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=ouhwgEKPFrdMAMB6Z7P/fSCzu2LRKSwb2VcXTbZhtxIFm06d7ZTeAkln2tDL/4BHL vLbIkxcbMQYjfTL+/iIYfVrMERIGmd1PHwJUDouNkQDhBZbtTAXcvjsR21XhV9CIye Wu9YRs8EYXsMjsnN9nk/EUAiSxQTNRHuMARy4isY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id B39933858C60 for ; Sat, 29 Apr 2023 13:13:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B39933858C60 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4efe8991bafso1180919e87.0 for ; Sat, 29 Apr 2023 06:13:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774038; x=1685366038; 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=p1L8QPGACgmes4wtZgddLp/fG1aOjQ4PWzv8KkAi66Q=; b=kjJyl+vkKcgpcwIi4HcvZbitIRKlNxmebwL1DtvGgtfFXO9dUWKI7mSq3whKVQXe/I QZnwzCpVtHqohAMwmorYnC6uTbjDg0jNZ6fmTUPD0x8uYoVxr0/yfCUbCZa8CrLmqftW rWEAJY0CbQ6ZzANH8Rie+iHdC/v8G8k6YeMHRhXngJ6PYvJdCn6l7ygu2DFOI8L+4RD1 31kXPfaMVR5G7wOF1Fh5cvR6mtCw7ATXf3yl/3t6UGVf18BZ9eutIxkR4k7PsW1kMNBe kT69EVe0DPMZlp1zoGtogNlVwxubEdl1BYrW870AQkvnk/i0XQsL1Azu6tcYwwxvOhsd 4aqQ== X-Gm-Message-State: AC+VfDxjWjNOjdvYSQfys/6BFNJ20JC5fcO9P9KnOiCVyabEcR/+xMNp +tInheqoZgk3VSYXv8KIssozLTxgY/7Tog== X-Google-Smtp-Source: ACHHUZ7Rp8VALfhw0GE6Wv6p+3RW1VHicnp/JFrV5ocs260F3yFf6KOUw6v5F8vOl4P9M7V3IzASAg== X-Received: by 2002:ac2:48b3:0:b0:4ec:7967:9e8a with SMTP id u19-20020ac248b3000000b004ec79679e8amr2255305lfg.16.1682774037841; Sat, 29 Apr 2023 06:13:57 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:13:57 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 3/7] hurd: Mark various conditions as unlikely Date: Sat, 29 Apr 2023 16:13:50 +0300 Message-Id: <20230429131354.2507443-3-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev --- hurd/hurd/fd.h | 10 +++++----- hurd/hurd/signal.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index 241797bf..824b7dbb 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -73,18 +73,18 @@ _hurd_fd_get (int fd) HURD_CRITICAL_BEGIN; __mutex_lock (&_hurd_dtable_lock); - if (fd < 0 || fd >= _hurd_dtablesize) + if (__glibc_unlikely (fd < 0 || fd >= _hurd_dtablesize)) descriptor = NULL; else { struct hurd_fd *cell = _hurd_dtable[fd]; - if (cell == NULL) + if (__glibc_unlikely (cell == NULL)) /* No descriptor allocated at this index. */ descriptor = NULL; else { __spin_lock (&cell->port.lock); - if (cell->port.port == MACH_PORT_NULL) + if (__glibc_unlikely (cell->port.port == MACH_PORT_NULL)) /* The descriptor at this index has no port in it. This happens if it existed before but was closed. */ descriptor = NULL; @@ -107,7 +107,7 @@ _hurd_fd_get (int fd) #define HURD_FD_USE(fd, expr) \ ({ struct hurd_fd *descriptor = _hurd_fd_get (fd); \ - descriptor == NULL ? EBADF : (expr); }) + __glibc_unlikely (descriptor == NULL) ? EBADF : (expr); }) /* Evaluate EXPR with the variable `port' bound to the port to FD, and `ctty' bound to the ctty port. */ @@ -125,7 +125,7 @@ _hurd_fd_get (int fd) io_t port, ctty; \ void *crit = _hurd_critical_section_lock (); \ __spin_lock (&__d->port.lock); \ - if (__d->port.port == MACH_PORT_NULL) \ + if (__glibc_unlikely (__d->port.port == MACH_PORT_NULL)) \ { \ __spin_unlock (&__d->port.lock); \ _hurd_critical_section_unlock (crit); \ diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 302ca25e..8a547fd0 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -249,9 +249,9 @@ _hurd_critical_section_unlock (void *our_lock) sigset_t pending; _hurd_sigstate_lock (ss); __spin_unlock (&ss->critical_section_lock); - pending = _hurd_sigstate_pending(ss) & ~ss->blocked; + pending = _hurd_sigstate_pending (ss) & ~ss->blocked; _hurd_sigstate_unlock (ss); - if (! __sigisemptyset (&pending)) + if (__glibc_unlikely (!__sigisemptyset (&pending))) /* There are unblocked signals pending, which weren't delivered because we were in the critical section. Tell the signal thread to deliver them now. */ From patchwork Sat Apr 29 13:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68546 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 447FC385609B for ; Sat, 29 Apr 2023 13:15:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 447FC385609B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774106; bh=wTAfen2SfpNBGuoKNSSnvaxSOX+jRZbcsenC0IC1Nwc=; 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=s4kAdMH8rq0p4mU71wF1BsBpJ1fp0aU1Ht/wvZPM13ex1562jDvwdCfOKVp/XKrV8 ezJbsk3oqrb8OfQSx7bFA/JoEA1j88LsoSsvn2+vPq+/gbn218bkolTL/E1D+LbK5z VMWWH4FjHlhFeHWdYIx0nia0OnCtlDpMIw22RZRI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id B0E003858C30 for ; Sat, 29 Apr 2023 13:14:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B0E003858C30 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4f004943558so1120566e87.3 for ; Sat, 29 Apr 2023 06:14:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774039; x=1685366039; 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=wTAfen2SfpNBGuoKNSSnvaxSOX+jRZbcsenC0IC1Nwc=; b=EfniFbEi7vfMhimyGeLz8xLbKtGgqrLgQj2ZW7lZvhrWFp7d64u6P+TFosbw3F+Kfq VSQccBKiuCwPSWD1Vj5TnOOjlP/tlNmaAXC9xPu0PJOjz3Y548aVKt7iQxCW6IR6iL9D n3HrLlNj2w60Ji3gCxS2NmbkYo+LZjuLrOVw9I3WAqz4l5T5fxDWyLBV6Md3UN6iqf2B sp+YvclgKo5/NdQn4p1Q9N53yT3TiCbOU8/3GXDtpTN2CxGCRY+k6Mm58QyjJ7hYtAGi WemBDdLizHoSEw94/mUKjm0I7539Ud9oq5A/AD0T+1OXPcWClplyhIvC7fQob/4+c6+q FXXQ== X-Gm-Message-State: AC+VfDzr7G3y3O0PybGLsllAoFqdlVmETUfkd/id8FR/LZa9LYJeF3LR HdcTFfIlkPZ+qispq9FofQWZQGSzYBPJqA== X-Google-Smtp-Source: ACHHUZ6bY5STQhXOyiw5iNC+i3pEiNg9UHWdYB2eyE0MmhxLDdodXWs0pWN5lECkBeQiMMeS9QeXRA== X-Received: by 2002:a05:6512:15a:b0:4eb:d8d:6c13 with SMTP id m26-20020a056512015a00b004eb0d8d6c13mr2248439lfo.9.1682774038876; Sat, 29 Apr 2023 06:13:58 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:13:58 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 4/7] hurd: Make _exit work during early boot-up Date: Sat, 29 Apr 2023 16:13:51 +0300 Message-Id: <20230429131354.2507443-4-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" If any of the early boot-up tasks calls exit () or returns from main (), terminate it properly instead of crashing on trying to dereference _hurd_ports and getting forcibly terminated by the kernel. We sadly cannot make the __USEPORT macro do the check for _hurd_ports being unset, because it evaluates to the value of the expression provided as the second argument, and that can be of any type; so there is no single suitable fallback value for the macro to evaluate to in case _hurd_ports is unset. Instead, each use site that wants to care for this case will have to do its own checking. Checked on x86_64-gnu. Signed-off-by: Sergey Bugaev --- sysdeps/mach/hurd/_exit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sysdeps/mach/hurd/_exit.c b/sysdeps/mach/hurd/_exit.c index 73957744..80cfe532 100644 --- a/sysdeps/mach/hurd/_exit.c +++ b/sysdeps/mach/hurd/_exit.c @@ -24,8 +24,9 @@ void _hurd_exit (int status) { - /* Give the proc server our exit status. */ - __USEPORT (PROC, __proc_mark_exit (port, status, 0)); + if (_hurd_ports != NULL) + /* Give the proc server our exit status. */ + __USEPORT (PROC, __proc_mark_exit (port, status, 0)); /* Commit suicide. */ __task_terminate (__mach_task_self ()); From patchwork Sat Apr 29 13:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68548 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 07C4E3856965 for ; Sat, 29 Apr 2023 13:15:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07C4E3856965 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774149; bh=Ib4fNFAuaWK6iGZT3lnjhLEpmOqdRxJ4aCuzLTqjR4Y=; 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=RIZkXMLVuJkjEvsorO+uyfkPTLlsI+CPuNi86IN/J3xfSId0mIN5jEz4lgfGhKCA8 LkPAUyWATOerNns3gAP4HDw255IEygeQmb3DPN/vfDGutnuXwYwGnhlPbiXlIDkOib RZGnr3+571yDRmbzv3lvV6qgPuYEfh0dx3ArcjYc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id B82D03858438 for ; Sat, 29 Apr 2023 13:14:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B82D03858438 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f00d41df22so15021221e87.1 for ; Sat, 29 Apr 2023 06:14:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774040; x=1685366040; 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=Ib4fNFAuaWK6iGZT3lnjhLEpmOqdRxJ4aCuzLTqjR4Y=; b=iA3JzTA4+sbTMeFYe/b9c9qbK2xsCIq9W5uRHzmWqRohqH8YWEGaPXLKdDB8n/F4xx zBRZ/hMQct7YKMMUVQSAFTOoyThub1gM1W9myhG6YV/bPrnPIMoX4O/YXRTPVd+4E0hq d+Qj/cpyJbFrYAJ0h/awZK5gQXSPnmG/nnv2RwQDN+fhOYyqfD5GEF6Y2XuT2y4+R6ND 9T4DGTOjgbfnV9EbayMbOeMSAbH06lVW/qx81ygphNBIUcivgJliJZxNTCDnTkVODat+ ItCB8dDXZ25AXUvF2VaucvdbqXc6FEL07XR5SKRZzdll/CdDEJ0o1xfnQlWTE7akhVr1 eLew== X-Gm-Message-State: AC+VfDxIbrNN910G8q2xlWaItvBphQ74/FLUlEZjwrYb7pHqWX/4lWvO QYtMX8oTU91oVt6/u8845BYtlm/PxtmjAw== X-Google-Smtp-Source: ACHHUZ6mNOhyoUVUpIream0HMMNYOYkgvuWOxXvDa858K2lx7XOJWlzRfkkPx1J3kS2ucXaSBoT9IQ== X-Received: by 2002:ac2:43bc:0:b0:4a4:68b7:deab with SMTP id t28-20020ac243bc000000b004a468b7deabmr2253982lfl.7.1682774039795; Sat, 29 Apr 2023 06:13:59 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:13:59 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 5/7] hurd: Don't leak the auth port in msg* RPCs Date: Sat, 29 Apr 2023 16:13:52 +0300 Message-Id: <20230429131354.2507443-5-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The leak can be easily reproduced (and observed) using the portinfo tool: $ portinfo -v $$ | grep task 36: send task(1577)(self) (refs: 127) $ portinfo -v $$ | grep task 36: send task(1577)(self) (refs: 253) $ portinfo -v $$ | grep task 36: send task(1577)(self) (refs: 379) $ portinfo -v $$ | grep task 36: send task(1577)(self) (refs: 505) $ portinfo -v $$ | grep task 36: send task(1577)(self) (refs: 631) Checked on i686-gnu. Signed-off-by: Sergey Bugaev --- hurd/hurdmsg.c | 67 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index 4bedd292..896fb87c 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -35,11 +35,17 @@ kern_return_t _S_msg_get_init_port (mach_port_t msgport, mach_port_t auth, int which, mach_port_t *result, mach_msg_type_name_t *result_type) { + error_t err; + AUTHCHECK; + *result_type = MACH_MSG_TYPE_MOVE_SEND; /* This function adds a new user reference for the *RESULT it gives back. Our reply message uses a move-send right that consumes this reference. */ - return _hurd_ports_get (which, result); + err = _hurd_ports_get (which, result); + if (!err && MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); + return err; } kern_return_t @@ -51,10 +57,13 @@ _S_msg_set_init_port (mach_port_t msgport, mach_port_t auth, AUTHCHECK; err = _hurd_ports_set (which, port); - if (err == 0) + + if (!err && MACH_PORT_VALID (port)) __mach_port_deallocate (__mach_task_self (), port); + if (!err && MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); - return 0; + return err; } kern_return_t @@ -88,6 +97,8 @@ _S_msg_get_init_ports (mach_port_t msgport, mach_port_t auth, } *ports_type = MACH_MSG_TYPE_MOVE_SEND; + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -108,6 +119,8 @@ _S_msg_set_init_ports (mach_port_t msgport, mach_port_t auth, __mach_port_deallocate (__mach_task_self (), ports[i]); } + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -152,9 +165,16 @@ kern_return_t _S_msg_get_init_int (mach_port_t msgport, mach_port_t auth, int which, int *value) { + error_t err; + AUTHCHECK; - return get_int (which, value); + err = get_int (which, value); + if (err) + return err; + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); + return 0; } kern_return_t @@ -185,6 +205,8 @@ _S_msg_get_init_ints (mach_port_t msgport, mach_port_t auth, return err; } + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -236,9 +258,16 @@ kern_return_t _S_msg_set_init_int (mach_port_t msgport, mach_port_t auth, int which, int value) { + error_t err; + AUTHCHECK; - return set_int (which, value); + err = set_int (which, value); + if (err) + return err; + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); + return 0; } kern_return_t @@ -261,6 +290,8 @@ _S_msg_set_init_ints (mach_port_t msgport, mach_port_t auth, return err; } + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -278,6 +309,8 @@ _S_msg_get_fd (mach_port_t msgport, mach_port_t auth, int which, return errno; *result_type = MACH_MSG_TYPE_MOVE_SEND; + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -285,17 +318,25 @@ kern_return_t _S_msg_set_fd (mach_port_t msgport, mach_port_t auth, int which, mach_port_t port) { + error_t err; + AUTHCHECK; /* We consume the reference if successful. */ - return HURD_FD_USE (which, (_hurd_port2fd (descriptor, port, 0), 0)); + err = HURD_FD_USE (which, (_hurd_port2fd (descriptor, port, 0), 0)); + if (err) + return err; + + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); + return 0; } /* Snarfing and frobbing environment variables. */ kern_return_t _S_msg_get_env_variable (mach_port_t msgport, - const_string_t variable, // + const_string_t variable, char **data, mach_msg_type_number_t *datalen) { error_t err; @@ -322,14 +363,17 @@ _S_msg_get_env_variable (mach_port_t msgport, kern_return_t _S_msg_set_env_variable (mach_port_t msgport, mach_port_t auth, - const_string_t variable, // - const_string_t value, // + const_string_t variable, + const_string_t value, int replace) { AUTHCHECK; if (__setenv (variable, value, replace)) /* XXX name space */ return errno; + + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -381,6 +425,9 @@ _S_msg_set_environment (mach_port_t msgport, mach_port_t auth, return errno; __argz_extract (data, datalen, envp); __environ = envp; /* XXX cooperate with loadenv et al */ + + if (MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return 0; } @@ -433,6 +480,8 @@ _S_msg_get_dtable (mach_port_t process, out: __mutex_unlock (&_hurd_dtable_lock); HURD_CRITICAL_END; + if (!err && MACH_PORT_VALID (auth)) + __mach_port_deallocate (__mach_task_self (), auth); return err; } From patchwork Sat Apr 29 13:13:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68547 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 C3D2C385702B for ; Sat, 29 Apr 2023 13:15:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3D2C385702B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774108; bh=3dATLxkH3GnzLr0ArZjgS5VyRTP+KiINtCGUzZNmMOI=; 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=M/GSnB6QNKUSyJtnJxp78RRo0s7kHZ8yvBqL7iLfkzLbUzuQatTc192BEQQjQAocJ ufGTOuXF2UREnXQLFX8BcNJcnG487DruMnh8QzxuKtUK4jiC/HoqXMp1hfgUq3CCzn M32M2BMiN1erpviwEcAJMXyzlkDNC9mc+g/J23xw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 733C53857C44 for ; Sat, 29 Apr 2023 13:14:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 733C53857C44 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-4f004943558so1120599e87.3 for ; Sat, 29 Apr 2023 06:14:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774041; x=1685366041; 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=3dATLxkH3GnzLr0ArZjgS5VyRTP+KiINtCGUzZNmMOI=; b=IvmBWS0AuWxksZKl0RL4LKzuf2IVzsfIUxZmtu3wHvB+hirVjQ6dy0veaY9M7sXGJ0 F6R2myyO3NPpdoQn3v4Hf9TDXGLGpoxEJec3ag5XazysWLB08jBSBeJb3L0ZKrUrt6IH Q4Zjnbz3Z87d9OunVv+kl0l0DqQnQlVnaU8r8iq/Yf6y79+CD+OoTjq55jl70rQmcm9o camCaRooRDrRj+5FpPbklsmFNl8yp38M1eoJyTm/dNEHMBoEmnZ9z3Ff/Rbvemyq0lyI 2XLwSVO8FAhFi8o3FlHtiRIBnTuh5Epu69gfe3Q/b8edayY7POtmxcQXtiQig8Rvqtg9 pkVw== X-Gm-Message-State: AC+VfDxWssAqCdEeTxO2ha9U+foB0LgDVaFoudZu7inybMJ4DcovE4Lg bj9UJ5X/pHt7/Jh4GMWgqslfwnDQqS5nuw== X-Google-Smtp-Source: ACHHUZ5v/nsgJ0GdqinICxqA/DFMZLxoV7qmPLRztSoMF1qX5/6GGMfcpM9R2fp56DMpaHz3t/agTQ== X-Received: by 2002:a19:f814:0:b0:4e8:3fca:4927 with SMTP id a20-20020a19f814000000b004e83fca4927mr2277786lff.58.1682774040735; Sat, 29 Apr 2023 06:14:00 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:14:00 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 6/7] hurd: Respect existing FD_CLOEXEC in S_msg_set_fd Date: Sat, 29 Apr 2023 16:13:53 +0300 Message-Id: <20230429131354.2507443-6-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" If the process has set the close-on-exec flag for the file descriptor, it expects the file descriptor to get closed on exec, even if we replace what the file descriptor refers to. Signed-off-by: Sergey Bugaev --- hurd/hurdmsg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index 896fb87c..8fde1f53 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -323,7 +323,13 @@ _S_msg_set_fd (mach_port_t msgport, mach_port_t auth, AUTHCHECK; /* We consume the reference if successful. */ - err = HURD_FD_USE (which, (_hurd_port2fd (descriptor, port, 0), 0)); + err = HURD_FD_USE (which, + ({ + int flags = (descriptor->flags & FD_CLOEXEC) + ? O_CLOEXEC : 0; + _hurd_port2fd (descriptor, port, flags); + 0; + })); if (err) return err; From patchwork Sat Apr 29 13:13:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68545 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 9DDE038555BE for ; Sat, 29 Apr 2023 13:14:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DDE038555BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774078; bh=j3IgtVAITHaI/IR3ddnAn8wysTCyQN+yA2tv+H+dZxQ=; 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=Vd6HhIR/pZD148JFcY18DQsjOBSH5DS7vxrOCnqNMtV+PFz/zy6+lG5WdX4JPSSbm MrJjwVhOy0Sn5ZMyg6rkvJJG/YAqK1M6NR4FeA/LxSqhaUBx8ooqJOLkdWtCNik5Hd Y0amsLPF6HpgvtKwrd82F9zovKNJ/K7OCl5PH0Ko= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id 67419385770E for ; Sat, 29 Apr 2023 13:14:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67419385770E Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4ec9c7c6986so1129202e87.0 for ; Sat, 29 Apr 2023 06:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774042; x=1685366042; 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=j3IgtVAITHaI/IR3ddnAn8wysTCyQN+yA2tv+H+dZxQ=; b=h9oQhNKab+NYo6uLKD/7Z/xzs3HpArQjwx6a+eh3E91xwg20+/QVjkZbj/tWVAlRdN GYkdejYxPAt/9JgKh/W79cUnfdBP9Yxl0PrSCIwIBgKweN1W4Aiz0vlAVa27WE7QwYdT DHOX1YZMrJIII7silvljMboM2ro1YaCDQJck4BjEmfSBOzCZTJoX83QG8GJVXtm0a2NH hgQqz3NHaNETO5FczQVzNycVxMAZqzq6q9lJPSSeCKKSBO2begTXTGjBJtrmBja30xlp 57s4d6EJncm3kv7yrgfbbkS+wzOMjOKbPklVAqaoRZnFitg/fnmsNBsjiHFyPHPjHuRZ 72sw== X-Gm-Message-State: AC+VfDzrmVRpv+jjyrjWHWONay1niuGyV6atN/wHSd1UCz6aLvG+gf4d ZahsPIrzFbkU1/w0KGhZxaSIFgAQh/0KqA== X-Google-Smtp-Source: ACHHUZ6e1Wn+ZF+Yu8U43SdiswyBV1SyK3ngS7tYGRXXvQKECS024wADlnUzia25FgJeLHupM7Ekiw== X-Received: by 2002:ac2:4218:0:b0:4ef:eb86:b9c5 with SMTP id y24-20020ac24218000000b004efeb86b9c5mr2158985lfh.67.1682774041587; Sat, 29 Apr 2023 06:14:01 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:14:01 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 7/7] hurd: Fix FS_RETRY_MAGICAL "machtype" handling Date: Sat, 29 Apr 2023 16:13:54 +0300 Message-Id: <20230429131354.2507443-7-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" We need to set file_name, not update retryname. This is what the other branches do. Before this change, any attempt to access such a file would segfault due to file_name being unset: $ settrans -ac /tmp/my-machtype /hurd/magic machtype $ cat /tmp/my-machtype Segmentation fault Checked on i686-gnu. Signed-off-by: Sergey Bugaev --- hurd/lookup-retry.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c index 99c98104..62f94bbc 100644 --- a/hurd/lookup-retry.c +++ b/hurd/lookup-retry.c @@ -277,7 +277,6 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) error_t err; struct host_basic_info hostinfo; mach_msg_type_number_t hostinfocnt = HOST_BASIC_INFO_COUNT; - char *p; /* XXX want client's host */ if (err = __host_info (__mach_host_self (), HOST_BASIC_INFO, (integer_t *) &hostinfo, @@ -288,13 +287,11 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) err = EGRATUITOUS; goto out; } - p = _itoa (hostinfo.cpu_subtype, &retryname[8], 10, 0); - *--p = '/'; - p = _itoa (hostinfo.cpu_type, &retryname[8], 10, 0); - if (p < retryname) + file_name = _itoa (hostinfo.cpu_subtype, &retryname[8], 10, 0); + *--file_name = '/'; + file_name = _itoa (hostinfo.cpu_type, file_name, 10, 0); + if (file_name < retryname) abort (); /* XXX write this right if this ever happens */ - if (p > retryname) - memmove (retryname, p, strlen(p) + 1); startdir = *result; } else