From patchwork Sat Mar 18 16:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 1758531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=TGs2BRiM; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pf6Y864kTz1yWp for ; Sun, 19 Mar 2023 03:54:36 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC09C383E6A4 for ; Sat, 18 Mar 2023 16:54:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CC09C383E6A4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679158474; bh=WRuAuZFPcfmWKkOUyAam9gnkOm44ma+P45jbuBWLr5w=; 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=TGs2BRiMAyq1ECtVbs+rBwQ7l0pmlge4636YRaKB7cBEZ20ObgynhZsQ12cta1niL /htdaFpaAEipWAn3VXMhJ5f+DQ3afT5yyiMwP2M9EOdn7LHlLHPYqxkqDDmZTwOmXX +d4wSSgtrsinavOAzlxxOI+q62zy0rKKCCD8qsKM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from forward101b.mail.yandex.net (forward101b.mail.yandex.net [178.154.239.148]) by sourceware.org (Postfix) with ESMTPS id ED7D73864839 for ; Sat, 18 Mar 2023 16:51:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED7D73864839 Received: from myt6-1289f562e823.qloud-c.yandex.net (myt6-1289f562e823.qloud-c.yandex.net [IPv6:2a02:6b8:c12:259d:0:640:1289:f562]) by forward101b.mail.yandex.net (Yandex) with ESMTP id 6C7E2600FA for ; Sat, 18 Mar 2023 19:51:54 +0300 (MSK) Received: by myt6-1289f562e823.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id cpp3fcrbC8c1-1L2ldFAX; Sat, 18 Mar 2023 19:51:53 +0300 X-Yandex-Fwd: 1 To: libc-alpha@sourceware.org Cc: Stas Sergeev Subject: [PATCH 09/13] elf: call _dl_map_segment() via premap callback Date: Sat, 18 Mar 2023 21:51:06 +0500 Message-Id: <20230318165110.3672749-10-stsp2@yandex.ru> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230318165110.3672749-1-stsp2@yandex.ru> References: <20230318165110.3672749-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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: Stas Sergeev via Libc-alpha From: stsp Reply-To: Stas Sergeev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" This allows to install custom premap callbacks in the subsequent patches. The test-suite was run on x86_64/64 and showed no regressions. Signed-off-by: Stas Sergeev --- elf/dl-load.c | 13 ++++++++++--- elf/dl-load.h | 6 +++++- elf/dl-map-segments.h | 7 +++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 17f16c7dd0..d54a8f59ac 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -959,7 +959,8 @@ _ld_map_object_1 (struct link_map *l, void *fd, int mode, struct link_map *loader, void **stack_endp, int *errval_p, const char **errstring_p, - __typeof (do_mmap) *m_map) + __typeof (do_mmap) *m_map, + dl_premap_t *premap) { const ElfW(Ehdr) *header; const ElfW(Phdr) *phdr; @@ -1159,7 +1160,7 @@ _ld_map_object_1 (struct link_map *l, void *fd, l_map_start, l_map_end, l_addr, l_contiguous, l_text_end, l_phdr */ errstring = _dl_map_segments (l, fd, header, type, loadcmds, nloadcmds, - maplength, has_holes, loader, m_map); + maplength, has_holes, loader, m_map, premap); if (__glibc_unlikely (errstring != NULL)) { /* Mappings can be in an inconsistent state: avoid unmap. */ @@ -1434,6 +1435,12 @@ do_mmap (void *addr, size_t length, int prot, int flags, return __mmap (addr, length, prot, flags, fd, offset); } +static void * +do_map_segment (void *mappref, size_t maplength, size_t mapalign, void *cookie) +{ + return (void *) _dl_map_segment ((ElfW(Addr)) mappref, maplength, mapalign); +} + #ifndef EXTERNAL_MAP_FROM_FD static #endif @@ -1564,7 +1571,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, } if (_ld_map_object_1 (l, &fd, fbp, mode, loader, stack_endp, &errval, - &errstring, do_mmap)) + &errstring, do_mmap, do_map_segment)) goto lose; /* We are done mapping in the file. We no longer need the descriptor. */ diff --git a/elf/dl-load.h b/elf/dl-load.h index eff5146acd..e777da5838 100644 --- a/elf/dl-load.h +++ b/elf/dl-load.h @@ -84,6 +84,9 @@ static void * do_mmap (void *addr, size_t length, int prot, int flags, void *arg, off_t offset); +typedef void * +(dl_premap_t) (void *mappref, size_t maplength, size_t mapalign, void *cookie); + /* This is a subroutine of _dl_map_segments. It should be called for each load command, some time after L->l_addr has been set correctly. It is responsible for setting up the l_text_end and l_phdr fields. */ @@ -123,7 +126,8 @@ static const char *_dl_map_segments (struct link_map *l, void *fd, const size_t maplength, bool has_holes, struct link_map *loader, - __typeof (do_mmap) *m_map); + __typeof (do_mmap) *m_map, + dl_premap_t *premap); /* All the error message strings _dl_map_segments might return are listed here so that different implementations in different sysdeps diff --git a/elf/dl-map-segments.h b/elf/dl-map-segments.h index a5c041c740..43a59752bb 100644 --- a/elf/dl-map-segments.h +++ b/elf/dl-map-segments.h @@ -82,7 +82,8 @@ _dl_map_segments (struct link_map *l, void *fd, const ElfW(Ehdr) *header, int type, const struct loadcmd loadcmds[], size_t nloadcmds, const size_t maplength, bool has_holes, - struct link_map *loader, __typeof (do_mmap) *m_map) + struct link_map *loader, __typeof (do_mmap) *m_map, + dl_premap_t *premap) { const struct loadcmd *c = loadcmds; @@ -104,7 +105,9 @@ _dl_map_segments (struct link_map *l, void *fd, - MAP_BASE_ADDR (l)); /* Remember which part of the address space this object uses. */ - l->l_map_start = _dl_map_segment (mappref, maplength, c->mapalign); + l->l_map_start = (ElfW(Addr)) premap ((void *) mappref, + maplength, c->mapalign, + fd); if (__glibc_unlikely ((void *) l->l_map_start == MAP_FAILED)) return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;