From nobody Tue Feb 13 14:24:38 2024 X-Original-To: dev-commits-src-main@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 4TZ3Vv2XWLz5BQ3T; Tue, 13 Feb 2024 14:24:39 +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 4TZ3Vv1bTRz4Qpf; Tue, 13 Feb 2024 14:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834279; 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=m0M1bMWyS9rRuA44hijx95NWv8zh5ggBR86Qfa2fMYM=; b=b4eTmfmMo/ht5kGsld1sx1LlQEb+AyyTPVEa7soyEn0vfvVGZtblRPLpdyNi7DXJ/pFU+S nAF2/zOIt2jMbagKw8ABGTImcL3jfHU3S89gSliT7yiVMq5FfUluP+6dU0ls6KwogFx4If mz0NtxwEj5mN0tFHOMFG4OzXVYOrdXAm/e+oHqC258+GMWipk87mhmxgvSwRF9lS8+8rtx 2QKRfY4kOPCVLBDCwsKADtXBxcaVA/UW2VEoFSzTtr1jqDt9iKDxZ0ZFhSSo2u754Djzl7 //2F/lAJWJPPZpCgddq+diaStr5yuRj3D+bzHLBamVjxwjKsNK+tQApBsBTVIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707834279; a=rsa-sha256; cv=none; b=cQq8kyb+pqAbRmAzxbEiwAnJcAvUoXtZ9mvM6ZBfOHqvfJNFmXezZmzGjVhwDcGsbHYXGh WEKD0wTFfw3l4kN1DfV1rloj0uQ/GqYSr00QZ9SBKWxi9HhF7GqzXw/AbhgKoWsIxXPQpP nO+0HUWwW/JgslwS9V/Ryn9HsE9PkCxO5OpZGm03qvkVHNYsH2NnDN4Jl4emZqpeIvpYiI 33w+jEwrKTxuybk79zPx1aNFWktpr1255Uu7B9rZtsg/Jld2oqD/ZDHVokXH244OiAgmJz GuDFCfiUwhs8xkTxDPMVCIQZhx19MxoDPgWdR8sTO36FgqyAN/hPBcuH8gGNqQ== 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=1707834279; 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=m0M1bMWyS9rRuA44hijx95NWv8zh5ggBR86Qfa2fMYM=; b=Bep3rieDMue1jp2mMv6KzkzxJzc/bK1F7Xu/MANS34S+buyZsOdktGE5qxLp1yoX+i7v9m 5A1/dOrCJpna1XSOQfEzDURCCARYR1EsnuRgsDrTH37iRNsSuNLQESUwxFGuYI1AlpSfGk gs0l4y7QfdSDFlqoGSns1aTfaWzQQrC8zxcQtLbuhHXQ2SDbYMWduVtm6bdW6V0iStQFqx hpILPEydWm23StHB+ITr0BKpmc4NbjsYP/X20GYPmnPFNb5//0+jnk5e1gknkIb0Oqofgz H902pJfpiCOZfwJrPFfl8x5HZyrmcBvBQkAohcqqUc+cHfzgbX1cuCWZZce34Q== 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 4TZ3Vt64jgzJfn; Tue, 13 Feb 2024 14:24:38 +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 41DEOctd001279; Tue, 13 Feb 2024 14:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DEOcXH001275; Tue, 13 Feb 2024 14:24:38 GMT (envelope-from git) Date: Tue, 13 Feb 2024 14:24:38 GMT Message-Id: <202402131424.41DEOcXH001275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9ea864b54b57 - main - rtld symlook_obj: move common code to check filtees into helper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9ea864b54b57f2d0125860fb923f8db52b20eac2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ea864b54b57f2d0125860fb923f8db52b20eac2 commit 9ea864b54b57f2d0125860fb923f8db52b20eac2 Author: Konstantin Belousov AuthorDate: 2024-02-13 00:48:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-13 14:23:41 +0000 rtld symlook_obj: move common code to check filtees into helper Revieved by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43858 --- libexec/rtld-elf/rtld.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 24abc4580f53..31560b79f19e 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4690,6 +4690,20 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) return (ESRCH); } +static int +symlook_obj_load_filtees(SymLook *req, SymLook *req1, const Obj_Entry *obj, + Needed_Entry *needed) +{ + DoneList donelist; + int flags; + + flags = (req->flags & SYMLOOK_EARLY) != 0 ? RTLD_LO_EARLY : 0; + load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); + donelist_init(&donelist); + symlook_init_from_req(req1, req); + return (symlook_needed(req1, needed, &donelist)); +} + /* * Search the symbol table of a single shared object for a symbol of * the given name and version, if requested. Returns a pointer to the @@ -4702,9 +4716,8 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) int symlook_obj(SymLook *req, const Obj_Entry *obj) { - DoneList donelist; SymLook req1; - int flags, res, mres; + int res, mres; /* * If there is at least one valid hash at this point, we prefer to @@ -4719,11 +4732,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) if (mres == 0) { if (obj->needed_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; @@ -4731,11 +4741,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) return (res); } if (obj->needed_aux_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_aux_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_aux_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out;