From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 5F48238582BD for ; Mon, 24 Apr 2023 20:45:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F48238582BD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr33U-00022U-VG; Mon, 24 Apr 2023 16:45:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=zPP7yXksTwwiCyNEpxoghx1BphiG/pRq5rfRCqv8KrE=; b=jKKL3eB61k/88GBVS1ID 0uH6VsLalPmpO+sFIbjXz3fvaWqcx2hNBpR/SetXXrkW0uYDhYlKBsbzPnGVJUDDwa55dh5r9zYLl Fm+XmxCWBUpsmWjow9f03keNUMqQe4e1c0rpXWlBUvyOKcbRKaeGRiJXVZXqZG0tGbb977AgOpdKj q0oiL1iO+sCfKLIDB70iYkHFtUnXVyQ83kjKfAmcOpzLq4DwphbxiHuno3jAqYn28LkFEuxoYjC0a 1SIvkmKgHcPfZO/pf0JCnRfChaDEU8yXU+YuR10cKrdxaTdgxuXO8RQKrt2rCk4NZhy6657ENOu+0 0hgrqCYJrLyPmw==; Received: from [2a01:cb19:4a:a400:de41:a9ff:fe47:ec49] (helo=begin.home) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr33U-0003Fm-Oj; Mon, 24 Apr 2023 16:45:00 -0400 Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1pr33T-003ts2-07; Mon, 24 Apr 2023 22:44:59 +0200 Date: Mon, 24 Apr 2023 22:44:59 +0200 From: Samuel Thibault To: Sergey Bugaev Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: Re: [PATCH 2/4] hurd: Don't attempt to deallocate MACH_PORT_DEAD Message-ID: <20230424204458.jfvh2ct4gr5r74hh@begin> Mail-Followup-To: Sergey Bugaev , libc-alpha@sourceware.org, bug-hurd@gnu.org References: <20230423215526.346009-1-bugaevc@gmail.com> <20230423215526.346009-2-bugaevc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230423215526.346009-2-bugaevc@gmail.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,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 List-Id: Applied, thanks! Sergey Bugaev, le lun. 24 avril 2023 00:55:24 +0300, a ecrit: > ...in some more places. > > Signed-off-by: Sergey Bugaev > --- > sysdeps/mach/hurd/dl-sysdep.c | 2 +- > sysdeps/mach/hurd/mmap.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c > index d7b309e0..25a12774 100644 > --- a/sysdeps/mach/hurd/dl-sysdep.c > +++ b/sysdeps/mach/hurd/dl-sysdep.c > @@ -472,7 +472,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) > err = __io_map ((mach_port_t) fd, &memobj_rd, &memobj_wr); > if (err) > return __hurd_fail (err), MAP_FAILED; > - if (memobj_wr != MACH_PORT_NULL) > + if (MACH_PORT_VALID (memobj_wr)) > __mach_port_deallocate (__mach_task_self (), memobj_wr); > } > > diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c > index c3cc1856..790eb238 100644 > --- a/sysdeps/mach/hurd/mmap.c > +++ b/sysdeps/mach/hurd/mmap.c > @@ -91,7 +91,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) > if (wobj == robj) > max_vmprot |= VM_PROT_WRITE; > memobj = robj; > - if (wobj != MACH_PORT_NULL) > + if (MACH_PORT_VALID (wobj)) > __mach_port_deallocate (__mach_task_self (), wobj); > break; > case PROT_WRITE: > @@ -99,7 +99,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) > if (robj == wobj) > max_vmprot |= VM_PROT_READ|VM_PROT_EXECUTE; > memobj = wobj; > - if (robj != MACH_PORT_NULL) > + if (MACH_PORT_VALID (robj)) > __mach_port_deallocate (__mach_task_self (), robj); > break; > case PROT_READ|PROT_WRITE: > @@ -167,7 +167,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) > copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); > } > > - if (memobj != MACH_PORT_NULL) > + if (MACH_PORT_VALID (memobj)) > __mach_port_deallocate (__mach_task_self (), memobj); > > if (err == KERN_PROTECTION_FAILURE) > -- > 2.40.0 > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.