From nobody Mon Aug 28 00:28:25 2023 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 4RYry16vCzz4rpc7; Mon, 28 Aug 2023 00:28:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RYry16Q5Tz3YL4; Mon, 28 Aug 2023 00:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182505; 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=foPCN1SsGyuY7leOl6OFBgxwvPqMtOWXKi7/W1kCTBI=; b=wpIGG3jO/20+rQSEHMlHHkdHjFbLTeBtcgCy4He4BUeolCCSplmAIqVkolKr+icxiHgUl2 z2DfGVAgft4Ptem8GE21eH1t0EGve2LRcf00dPRxmgqp6b40TE8wZVwOSjF8c3K1SUJ6Zk aBwQZJ0WbCvaaylw7N3GoEC++3tn19lNTdaXhPKHGDEt3S78ZI+gMmlR4AkYB615VaTE5V 1O7/Tv5axpScDxqF9e0/RQ3biXL04DgLkwefv9lMIiLgrwV/4XrHU4+LaVhVVoV04+/8QF eUzY2zxbDpycnxNAAA9S9T4+Ix4WwsyZ8vJHbK9c7zF1JY2W9JrCRenI1Bh3DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182505; 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=foPCN1SsGyuY7leOl6OFBgxwvPqMtOWXKi7/W1kCTBI=; b=Kr8VZFktbod8eauvN09Cr6ET7hks/AL+tluDT32/txZAT7ige2A2rRe8M4jX2Mish5ULOo 8Kok1y2hbF93u2aeDoI+tedllh8j3PmTF5u+W2mNSyDxYZB0De7E+bqBZTe24JOrkpneQ+ CeHAhSj+KiwLj/oSKbDSHh840RPZCJ7k+W6T8fCE4lLvZYtTW+7GE9eShaV/0Nqvc7jiOZ j/znblpKQrn6FZcbIgbx7Gy2KpfwKwJeRdZeZlJypribllqPNuPJ0quCaQwcPb2llLvHw3 bXZIWXIvftOKEu3zybaXjinY48pof2BFxyiRXXWNkWHdZm9fk4zayzPRCoVdOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693182505; a=rsa-sha256; cv=none; b=T3V31dEShoo3pcfRGv/JegojpebXpErwLBJf4+mW8Q6lRr2DFh+WAVrMIGuQVQNdFFYIem 3ziaTrP3t9yeB5HR/ZLdhyCAlH7ddkitH8One2u7yBCj+FmjaQZ0O/Z5QSAyJ4sObRvd0X Ovmfqpu0aQmlzJOxqwY4KuDCu32hiMej2gShl/gG0Bw6pd+oeBbPYnQqd/PngT8O4Y4IPo UZNBg39fiJiGI+VK1R56LGYswwww0dbh+zgU4zhK7+27wyzCmjT9eJ9CxNTe6luPGzyF8w osGyctrW3tgSTbv/kuxfiMtfThl8gJXO8E++XB5TxgBYU1W1vyo8jelieppRtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RYry15RkczngB; Mon, 28 Aug 2023 00:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37S0SP4G069832; Mon, 28 Aug 2023 00:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S0SPlD069829; Mon, 28 Aug 2023 00:28:25 GMT (envelope-from git) Date: Mon, 28 Aug 2023 00:28:25 GMT Message-Id: <202308280028.37S0SPlD069829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0a12bf23325d - stable/13 - rtld: switch from malloc_aligned() to __crt_aligned_alloc() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 0a12bf23325da9cb479ef844869200ff1b0255cf Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a12bf23325da9cb479ef844869200ff1b0255cf commit 0a12bf23325da9cb479ef844869200ff1b0255cf Author: Konstantin Belousov AuthorDate: 2023-07-30 01:51:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-28 00:27:48 +0000 rtld: switch from malloc_aligned() to __crt_aligned_alloc() (cherry picked from commit feaae6ba1ace0091384ac371423976cd15e59e5a) --- libexec/rtld-elf/rtld.c | 14 +++++++------- libexec/rtld-elf/rtld.h | 3 +-- libexec/rtld-elf/xmalloc.c | 30 +++++++----------------------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index e8b901bda634..888586cf876d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5300,13 +5300,13 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) tls_block_size += pre_size + tls_static_space - TLS_TCB_SIZE - post_size; /* Allocate whole TLS block */ - tls_block = malloc_aligned(tls_block_size, maxalign, 0); + tls_block = xmalloc_aligned(tls_block_size, maxalign, 0); tcb = (Elf_Addr **)(tls_block + pre_size + extra_size); if (oldtcb != NULL) { memcpy(tls_block, get_tls_block_ptr(oldtcb, tcbsize), tls_static_space); - free_aligned(get_tls_block_ptr(oldtcb, tcbsize)); + free(get_tls_block_ptr(oldtcb, tcbsize)); /* Adjust the DTV. */ dtv = tcb[0]; @@ -5370,7 +5370,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused) } } free(dtv); - free_aligned(get_tls_block_ptr(tcb, tcbsize)); + free(get_tls_block_ptr(tcb, tcbsize)); } #endif /* TLS_VARIANT_I */ @@ -5396,7 +5396,7 @@ allocate_tls(Obj_Entry *objs, void *oldtls, size_t tcbsize, size_t tcbalign) size = roundup(tls_static_space, ralign) + roundup(tcbsize, ralign); assert(tcbsize >= 2*sizeof(Elf_Addr)); - tls = malloc_aligned(size, ralign, 0 /* XXX */); + tls = xmalloc_aligned(size, ralign, 0 /* XXX */); dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr)); segbase = (Elf_Addr)(tls + roundup(tls_static_space, ralign)); @@ -5475,11 +5475,11 @@ free_tls(void *tls, size_t tcbsize __unused, size_t tcbalign) for (i = 0; i < dtvsize; i++) { if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart || dtv[i + 2] > tlsend)) { - free_aligned((void *)dtv[i + 2]); + free((void *)dtv[i + 2]); } } - free_aligned((void *)tlsstart); + free((void *)tlsstart); free((void *)dtv); } @@ -5516,7 +5516,7 @@ allocate_module_tls(int index) obj->tls_dynamic = true; - p = malloc_aligned(obj->tlssize, obj->tlsalign, obj->tlspoffset); + p = xmalloc_aligned(obj->tlssize, obj->tlsalign, obj->tlspoffset); memcpy(p, obj->tlsinit, obj->tlsinitsize); memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize); return (p); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 522638a5b1d9..e2fb3de470c3 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -367,8 +367,7 @@ Obj_Entry *map_object(int, const char *, const struct stat *); void *xcalloc(size_t, size_t); void *xmalloc(size_t); char *xstrdup(const char *); -void *malloc_aligned(size_t size, size_t align, size_t offset); -void free_aligned(void *ptr); +void *xmalloc_aligned(size_t size, size_t align, size_t offset); extern Elf_Addr _GLOBAL_OFFSET_TABLE_[]; extern Elf_Sym sym_zero; /* For resolving undefined weak refs. */ extern bool ld_bind_not; diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c index 80246f36dd26..5f7c1b5ba10a 100644 --- a/libexec/rtld-elf/xmalloc.c +++ b/libexec/rtld-elf/xmalloc.c @@ -75,34 +75,18 @@ xstrdup(const char *str) } void * -malloc_aligned(size_t size, size_t align, size_t offset) +xmalloc_aligned(size_t size, size_t align, size_t offset) { - char *mem, *res; - uintptr_t x; + void *res; offset &= align - 1; if (align < sizeof(void *)) align = sizeof(void *); - mem = xmalloc(size + 3 * align + offset); - x = roundup((uintptr_t)mem + sizeof(void *), align); - x += offset; - res = (void *)x; - x -= sizeof(void *); - memcpy((void *)x, &mem, sizeof(mem)); + res = __crt_aligned_alloc_offset(align, size, offset); + if (res == NULL) { + rtld_fdputstr(STDERR_FILENO, "Out of memory\n"); + _exit(1); + } return (res); } - -void -free_aligned(void *ptr) -{ - void *mem; - uintptr_t x; - - if (ptr == NULL) - return; - x = (uintptr_t)ptr; - x -= sizeof(void *); - memcpy(&mem, (void *)x, sizeof(mem)); - free(mem); -}