From nobody Tue Nov 03 09:01:57 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 4jJjHp0R2Cz6yPJj for ; Tue, 03 Nov 2026 09:01:58 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjHn6dw8z4KCg for ; Tue, 03 Nov 2026 09:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696517; 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=jpa2sVouAynqln/iOdWQR6x69y4NjiWUl+hgGHinGsA=; b=UUGwsjb5xB+S0cW8BF0LIpOXDE6cJo2md5Q1aU2p++lUA4qi5R5haan+QcN4Qc5S4Cj7lX 0/aGoDeijWVj7RyOXIb1cUmbrM2Xczi/AoU9GwnQHmGDf1MAM2bewNqnaDv6zjIM3cmTTC RRCUWiFvEmiE0COEZywLLZtPtjgr4Q4jlJv1u5qCfk7H7y6Wf7Q6Zv2sY16DYIh45FSTcf /Y8NT8bEJlr4wwn5gv1xVWW1wSLvuvaEUPdleC/erjHshuzPDMZm6VlVjVxiWYcnMXIxhh mCZzA6Hb5REMn1Xja44dleVQR6Z+RRkmqw0cNaHfDhcE1sb65jlpX2XFumqgGg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696517; b=wQVPKRTkSesTn15CGDdZyAAsg1QhU3zTUt5C5K3HWordf/EGRDdxlo2hMP3DWCKsSVuzzo 7nji2PDR4n/2zy0Z4XWtMV+3CwpLeRzLgY8SR/DxBOPUr328WSAVT+9Qyr8+q8lEZLmB9z dzRSeAppli98FFHQc3bZuYw6LlbQF83PkVVf0yEvhmizvBcJa6ZjgExEZXvGeHTBiQw0S+ RTv8Bvv06j5gZUU7j8UQMkPKGZrI2G/7Gj32nV9JgRqQGv85mehmgEP1siZ8NJBPgxlKzr 0FANIr5PXxfI9v8apz1etYvkyJtm1IAJmBm8yTe9bRNNSlRS2Qnx3DfPnm92+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696517; 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=jpa2sVouAynqln/iOdWQR6x69y4NjiWUl+hgGHinGsA=; b=mrxlhIZo8vxgB1OzKmuab2oiQ03hwtOdU5MLNAz0J4mlVkyv2DNFRYL9KFh0xqoCneVrQe 0mE7zJz/DY+LjPnfUfzt2ClAR69xkLJ5fEKKEvAvlnl1z6Yn/dCk2QchqMdhlsUNLwJa7b WKj2pv9ekWwXxxkr44wpi4ucENHV+IgEtu8DSZAUtN/cimIGoZ8y94xUxSBWAwYDMp9ZL6 MF9NE2ofavV3RparO0vKijsuxEZhqZ7WLEB/H1lahsIkeayjBs9MdrvZa5DPD6L6UmfB/6 oQzml99cxwpYWLHf/1kOeyUXiu2dhi71C1HW2n4qJLJi7ulHc6XkvUqNHBtStw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJjHn6JnLz1PDn for ; Tue, 03 Nov 2026 09:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:01:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 84d316496fa9 - stable/15 - rtld: extract donelist heap allocation into donelist_alloc() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: 84d316496fa9f735304b10b2542b328a743b9f03 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:01:57 +0000 Message-Id: <6ae9a305.44f9f.6484bbb3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84d316496fa9f735304b10b2542b328a743b9f03 commit 84d316496fa9f735304b10b2542b328a743b9f03 Author: Konstantin Belousov AuthorDate: 2026-10-25 17:57:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:11 +0000 rtld: extract donelist heap allocation into donelist_alloc() (cherry picked from commit 53cbd14ea7ca78c140ee90c1e459589bb574d938) --- libexec/rtld-elf/rtld.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index d2cd6c04a8a4..90ef765ab81c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1040,21 +1040,26 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) #define DLP_ALLOCA_LIMIT 100 /* 800 bytes on LP64 */ #define donelist_init(_DLP, _REQ) do { \ DoneList *_dlp = _DLP; \ - SymLook *_r = _REQ; \ _dlp->num_alloc = obj_count; \ _dlp->req = NULL; \ if (_dlp->num_alloc > DLP_ALLOCA_LIMIT) { \ - _dlp->objs = xcalloc(_dlp->num_alloc, sizeof(_dlp->objs[0])); \ - if (_r != NULL && _r->donelist_mem == NULL) { \ - _r->donelist_mem = _dlp->objs; \ - _dlp->req = _r; \ - } \ + donelist_alloc(_dlp, _REQ); \ } else { \ _dlp->objs = alloca(_dlp->num_alloc * sizeof(_dlp->objs[0])); \ } \ _dlp->num_used = 0; \ } while (0) +static void +donelist_alloc(DoneList *dlp, SymLook *req) +{ + dlp->objs = xcalloc(dlp->num_alloc, sizeof(dlp->objs[0])); + if (req != NULL && req->donelist_mem == NULL) { + req->donelist_mem = dlp->objs; + dlp->req = req; + } +} + static void donelist_free(DoneList *dlp) {