From nobody Mon Jun 29 20:33:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpyfN5zbnz6jpQc for ; Mon, 29 Jun 2026 20:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpyfN3xXpz3Nhr for ; Mon, 29 Jun 2026 20:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782765212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpA13r1kNiYnkX/6rDCxN5gQnEbvd3FQzJTqVNKObY=; b=Wdyc4PBhOcJRA6yA1ABjUjWmcOsgL4eprZbA42K58XhkGq2arg1sWSitl6c5C/H6dvACd3 ipJo43+TJ0pMq9gAm0RLqBlIB8ZYfmHSNnBvhZUCr7Lgshd9ZdCej+zX7QdeEGtwMKwjUy iCUZ9LC7RoCdLKFz89oT7RI1oPeIT3v2CF+Pn3xCKw+IQMPBHm/45xhzjTd458tNphVQ+s /y/Tj4hdqaUsM8Zr/nn3ctoVcHTOaS3J9GDEHDVWoExzSJ3CCC2JhU1e33bCfCdr0IJFi1 eCv17gJJeEy96Dn2IjkPeE8hqA87qxxJMY9vQ4Eg1xShfMiSv5dWHUyvmzAOSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782765212; a=rsa-sha256; cv=none; b=qFrgG3J6kPV3RZzw1zESYGbZGmB4TOecdsx0J7XFbKNKYiV2GqtgpXDwGQK0Xn5pc0GbtJ g6+3/Zs2XTkBB/3sEkX3+3QCuOoUS/rkXxHwnQFIQ9smE+KRQhnTAvNQmFb8s7b0wR2nph jwzNa4dEOkDt8Z03VS6SVakTjl0WvG2BDW0vQBJyyW8Ycqha3kZaCpXTVk0T4u+ujGiMu8 GpI0+QlcetPORHNfdgCexEevSwCmMk0F7jKfuF2BbknaM2DBthd/q9cHu7nzxdZ8ixg5vY fjie1QMYNhVkjmswUt033jjJl3O114NxTrb8jmSE2Fc8RJM6XSYWoGAPRqlruQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782765212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpA13r1kNiYnkX/6rDCxN5gQnEbvd3FQzJTqVNKObY=; b=coMQpXLgLv4Z4UDlzSiqRKE0wfgbI3FrLI/piWywAJTqBLeIwEdvhN3C+LnxgLsTq5VOAi ulBZmCr7NBk9JH1+yTATR/reMzIs1BJNgd9jaEeUYEUmUtfL20zMsrNhquU7YjvXJj1a1+ hgFfc1M1lvkWFPPJw+awVDoVtgCje/881k9n+mztvri1csQZeGMbvIcchDqQo+0pDr4WE1 uxE5sOAcLCZLfBDnP2hEKbVsY7tc8ZvFkYYEF29X/marzazWStAdFzw5RMJwaBn3xMWr6f o4I7tePs+5ZFBEkXHAtEN+Iz+Yp4ut3PUBntU853Bfb2LDm95DbeHfMV8Awxpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpyfN2nmyz1CNX for ; Mon, 29 Jun 2026 20:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3042f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 20:33:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 70fb92cd56bf - main - rtld: unify the return path for map_object() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70fb92cd56bfe88a12d2a253542320bad7198321 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 20:33:32 +0000 Message-Id: <6a42d69c.3042f.77ae759b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=70fb92cd56bfe88a12d2a253542320bad7198321 commit 70fb92cd56bfe88a12d2a253542320bad7198321 Author: Konstantin Belousov AuthorDate: 2026-06-29 20:08:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-29 20:33:12 +0000 rtld: unify the return path for map_object() Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57908 --- libexec/rtld-elf/map_object.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index d769d01d3b24..0b4e847f407e 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -338,7 +338,8 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) obj->stack_flags = stack_flags; if (note_start < note_end) digest_notes(obj, note_start, note_end); - if (note_map != NULL) +finish: + if (note_map != NULL && note_map != MAP_FAILED) munmap(note_map, note_map_len); munmap(hdr, page_size); free(segs); @@ -347,13 +348,10 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) error1: munmap(mapbase, mapsize); error: - if (note_map != NULL && note_map != MAP_FAILED) - munmap(note_map, note_map_len); if (!phdr_in_zero_page(hdr)) munmap(phdr, hdr->e_phnum * sizeof(phdr[0])); - munmap(hdr, page_size); - free(segs); - return (NULL); + obj = NULL; + goto finish; } bool