From nobody Mon Jul 6 01:06:18 2026 X-Original-To: dev-commits-src-branches@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 4gtmQM326Mz6k7QR for ; Mon, 06 Jul 2026 01:06:19 +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 4gtmQM0V0kz3RBm for ; Mon, 06 Jul 2026 01:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783299979; 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=G68boGXqWuW4hOQLNZNgy4Xme8rkrWS7AUrW7Rg3BoM=; b=JY7eec5tAsG5OoA7GzgB1/lp+UnvQzXLPtaZWXG15s/pYJ0jUDwpT2OWKqYR6FvgXsq49E qbpNz/7oEjyQFlE/eutzuQ0Mmn+nD/+t5JUjJB2qfeHh5n0ZaGO+g9X0sbY+bzyTVFy/Y0 mTnojWBCr467T4CmZC1/PD3Z1zSTaxhxmBj67Yfi+SNbdaeia3SzmkVuOooMBmtfsu1zqa MgUwRTNHpR4Dee1TnvmuDgdwXHJ3BN8PFjOyZEWLRHDOJK0CwkURw+ftIGqQnWAvaYka68 6zw6h6BsoMmvLSBqYMVBhi2mo1e0iz4+iUp/S+5zTg8x4lwxdioJYwywqC+IIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783299979; a=rsa-sha256; cv=none; b=McSQY9iC2s4exhMDtg2aAnxd+q02kcw1nuv+k7e0PGtNYobvjHbMDXXZRxxwoCgE2+/bto yPkAAWfu6gR8HAa+MMHJLS2G69/Pc+3aH5sm/+GWrhhImDnyeLo1y79BPuQ1SIDskbbr92 XBG5+Au9DG0/SXdiu7HdB5myxz+OEHznnL2nuU4M49XHa/guCkaa5Vjg8zf83o4DBexrKk 1hTXwWZ/x6zb9jhdop2z+kVNMRaSndI94eS2I35lnwAa40jjSIa9WrMulXaNuvFwVbdiEE vGW5XSusNr8fXaXUzlsqGF+7URHkAjULey/E4N3Ohxe6xVNsIAsXMy1qHL7Mug== 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=1783299979; 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=G68boGXqWuW4hOQLNZNgy4Xme8rkrWS7AUrW7Rg3BoM=; b=J+y/Ei9sYhUGqChLH3iey0TXXgQZCDM4HatiocUuCK51k2oDjtdtWJhPL77N1iMYse/Nr6 uu8vuoL9wVs3P3h8ihbQ1HeaQu90ulRY3Q8RgLRuzeGv2NSQa/22/IDXqhNzDqsiVBZafi p93RkLzY3ofm3p9p1VjTxfSZqK9tlXbFcx8+OGWaSksZw/yuGft8nh+hqB5SV6SgygGt/9 UUUPrYvLG31XvEkEcP+1nsa/uHTf+r2/szcFqjeYWJ1ZhRxn2uLRJfX5mWl00uHMYvi4zp CLlh+Rg+HoGFFNMlq3twUtlsxPuAjJUut7bqMWLk762GuKUSnqL8vWAyuvUAHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtmQL6MpszjDm for ; Mon, 06 Jul 2026 01:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:06:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b3ce127cc330 - stable/15 - rtld: unify the return path for map_object() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b3ce127cc3309f6c3b12bbc876ab347502707f9e Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:06:18 +0000 Message-Id: <6a4aff8a.3ab07.5329b2b8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b3ce127cc3309f6c3b12bbc876ab347502707f9e commit b3ce127cc3309f6c3b12bbc876ab347502707f9e Author: Konstantin Belousov AuthorDate: 2026-06-29 20:08:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:05:50 +0000 rtld: unify the return path for map_object() (cherry picked from commit 70fb92cd56bfe88a12d2a253542320bad7198321) --- 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