From patchwork Thu Jan 6 22:48:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 36059 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C1F1927BBEA; Thu, 6 Jan 2022 22:51:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8AE5327BBE9 for ; Thu, 6 Jan 2022 22:51:30 +0000 (GMT) Received: from localhost ([::1]:48584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5bbV-0002gC-Ps for patchwork@mira.cbaines.net; Thu, 06 Jan 2022 17:51:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5bZA-0007Rk-PB for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5bZA-00075A-EW for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5bZA-00005e-E4 for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53063] [PATCH wip-harden-installer 06/14] installer: Disable automatic finalization for child thread. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 22:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53063@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 53063-submit@debbugs.gnu.org id=B53063.164150932332671 (code B ref 53063); Thu, 06 Jan 2022 22:49:04 +0000 Received: (at 53063) by debbugs.gnu.org; 6 Jan 2022 22:48:43 +0000 Received: from localhost ([127.0.0.1]:42606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5bYo-0008Uf-FM for submit@debbugs.gnu.org; Thu, 06 Jan 2022 17:48:42 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5bYk-0008Td-6K for 53063@debbugs.gnu.org; Thu, 06 Jan 2022 17:48:38 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 66DA1184D98; Thu, 6 Jan 2022 22:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1641509317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FawzilmUJRjYzPcDHIlO5KnIPwKIRLaQUPxbldhYm5s=; b=cegc3RGI3/89zAXe4zxMw/wnGHEXsoY+YP++sEnCJcSo3zG73saHIykw6Z9I0Mo4wkUFNO +KKCeiXjMKnYrpBSiVG6KLYYLOIkBGtI1ymaUDi0qKkrx5tquJJqw9jotxyHhSbNX4Gnkn eL+95aPHyfFIVSfCro3/6iGRkrnsHl574fc+zQHMRJfItJzaSQbPu+hxkA3yc5Q6Eg9ip7 tLCUCGSAMxv/RMGdQlb87bwSHLO0ifB6aRbPahzRkUoh0MTgKdT9BPufNdJOkugjsAvxwk c73NjfZ8rN0SofuMMoycT6ysI+5+31aI+7JsxztUjysfT0AjqWOdX+IKibaZpA== Date: Thu, 6 Jan 2022 23:48:04 +0100 Message-Id: <17c53526bb7d92f07515a6c2cc165e717aa21346.1641507696.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/installer/utils.scm (run-external-command-with-handler): Disable finalization manually, to avoid having the finalizer thread spout "error in finalization thread: Success". --- gnu/installer/utils.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index 878434f074..ad220492d9 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -32,6 +32,8 @@ (define-module (gnu installer utils) #:use-module (ice-9 regex) #:use-module (ice-9 format) #:use-module (ice-9 textual-ports) + #:use-module (system foreign) + #:use-module (system foreign-library) #:export (read-lines read-all nearest-exact-integer @@ -143,6 +145,14 @@ (define* (run-external-command-with-handler handler command) (match (primitive-fork) (0 ;; We're in the child (close-port input) + ;; XXX: Disable automatic finalization because we're going to exec. + ;; Might become unnecessary with newer Guile versions, as the + ;; *possible* finalization thread may stop properly when its pipe is + ;; closed. + ((foreign-library-function (load-foreign-library #f) + "scm_set_automatic_finalization_enabled" + #:return-type int + #:arg-types (list int)) 0) (reset-fds (open-fdes "/dev/null" O_WRONLY) ;; Avoid port GC'ing closing the fd by increasing its revealed count.