From patchwork Sun Apr 23 21:55:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68199 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 694F23858291 for ; Sun, 23 Apr 2023 21:55:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 694F23858291 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682286953; bh=L7oeWsZL9dZlsjAqHQOHiPrLSGr+/RfmGfPLeQUTNUY=; 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=b+CA1w6F6DrwrnaqinMAWuU5I87nxsAxF2sE0d4OBKhEh46IPj+t/BlEEnbDx/LHc FgVrPz8RohmXWb7PlonTVBr7qIxLA+zN92+UcHGzFOMW3jwUEyam6pIy2rxZED20xY r45/G5XK7blpnQW2rwUETs1p094jadY7f3XCb6ls= 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 2F7713858C50 for ; Sun, 23 Apr 2023 21:55:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F7713858C50 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4efe8b3f3f7so1430837e87.2 for ; Sun, 23 Apr 2023 14:55:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682286929; x=1684878929; 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=L7oeWsZL9dZlsjAqHQOHiPrLSGr+/RfmGfPLeQUTNUY=; b=Fdy0zpquX+o14XOE7LbjJlUbi966NLhsQRRUjnfKx2jzWsOILjrONKfh0LBK72DLG3 5qE/7v+/L0i5Olos3/PK+a7QBtNNY4BvaSqR6of6gRgnTz996lOHf6pDZQwyAEyugAqm +Gs2BjoljTHnN+IK7u6KApWBuUrzXJf9ZIDHlV1IQGd8PUZn3InfD2az/7UVJmbMm3K6 Z8socwM9+SOOc2epAufgpZEScp4QujoZ7bA9rQM5LGIWbXmvWyXDkKHkmPHRh8mn6Rwg FvDCPi/V/yuZQvtMEmDPmGh08CmXWCgtyk0m6UDjVaj5c+OP2nu2ybXHMfDrBfO0TeFc OqIg== X-Gm-Message-State: AAQBX9dB2Fr006R0VCSuABctnUbuN2Qd0g1lvFMtPOECr/APQUEE5u3e jDScxiGml0KaVOifCFhbAnZ2OwNTFeyXkw== X-Google-Smtp-Source: AKy350aQ/eyNkY2dqI/2FxOLwL1YTX3piFa+qalqZkJwc3VTCkypeJrnK0MxtgmoHb6Z5HquCSsyVA== X-Received: by 2002:ac2:5dfb:0:b0:4e8:5392:492c with SMTP id z27-20020ac25dfb000000b004e85392492cmr2256326lfq.43.1682286929351; Sun, 23 Apr 2023 14:55:29 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:e26d:6595:78ee:6d64]) by smtp.gmail.com with ESMTPSA id q8-20020ac25a08000000b004ecb06acbb3sm1393905lfn.281.2023.04.23.14.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 14:55:28 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 2/4] hurd: Don't attempt to deallocate MACH_PORT_DEAD Date: Mon, 24 Apr 2023 00:55:24 +0300 Message-Id: <20230423215526.346009-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230423215526.346009-1-bugaevc@gmail.com> References: <20230423215526.346009-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" ...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)