From nobody Wed Jul 2 18:41:41 2025 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 4bXTJP3kSTz60n6C; Wed, 02 Jul 2025 18:41:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXTJP2Yxfz3Mgc; Wed, 02 Jul 2025 18:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751481701; 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=EtP8t+P1xpoDs4+lTJkA0BnEv0CLhiCTDHIFk7VdToc=; b=Rs35BUXRE6gkZHXaFa1GnDgj3gI0hgjIlZRyvGAwJJUCJA/QzdVanpvQsQ8rFbqiSb4ecv PIpUzGp8G+d9hgFL7TzVjfEe4ntLtfedNjNRajqz06JFTLwoJb8FVqaClmqqhd2MDJ0Ki7 qn3kiJzofnfVJGVK4XsA1rjB9X5d1S36ul8yIxqBV9P738LaAqe1bV57j8WhHxeJ12dSmK MMDmRpIx8W0da7KozFTv5R97iMjp1Qaiz5O+G5LQcfY21oC3t/55xrQdnTI5eFpHWpFLTr 0cjBon0my8donNSTbJVmx+vD8h++eqfGlBMhFzJd20cy/KIQluRTube6GwirNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751481701; 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=EtP8t+P1xpoDs4+lTJkA0BnEv0CLhiCTDHIFk7VdToc=; b=mv9Mcx3WQ5DVAp2laJ18z18ZV+q3YIGRj+0MbnnYGn2y3vlcNX6zc0qfp/ZqKxfyczcdvs R5GYslMr1bAgJbrnbgc0tTCq9hB8V7n88lRcBNGBA6/KeZ1PcKRBkcbmoO0mdv7T6sN5bK Sc99XTNtRjTSspZ0bSgJrsKvyoSQRsVeb7Us+JctGLYbE+nZn7INOht0Mlf6Xgx6pKMy2f 4HYGAnVeBqrGThKjIGFDymiQQcKIE1t9hR6C22IZ6XOL41tJgki2XZELBVmvzucbEAUKRd 6pzRULbj6eKk3NLASVpGAQWI752M2rjzXW+EtXtqq3ownf1K99fFrfpPypjnmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751481701; a=rsa-sha256; cv=none; b=n+bo/lP9HUU0nFWuh+KRkfrfoD1/HcviCypH0ka/eBD7fg9AUoNZ53IpMRD85A1J+XW9rI GuxCO57N/iLM4gI40n4ERzO9+arjXORaH1FbmmexLU9758bCHNb2d6YSG2IEN+dT3q4E9/ oRcD5NBZlqxM91ezNe9K3GNpYknKKWo+8Z2YoFaeSBPNeBlqKBFuEGlN5Z/LmliXBEpxTG Px2VxGj3ViPwtBISlnK0qaMCMbCmicvq2WTGftnBNHJRKyRNLqVOYdScbCdHVJTbIOTh+F tuoFrwpiuSeYyTiQzIk3IZQ8/K0Hqa7/Buigv5LNHxNzkrDpwRjQeWtXbh7j4Q== 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 4bXTJP27zGzWrY; Wed, 02 Jul 2025 18:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 562IffTP093606; Wed, 2 Jul 2025 18:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562IffIP093603; Wed, 2 Jul 2025 18:41:41 GMT (envelope-from git) Date: Wed, 2 Jul 2025 18:41:41 GMT Message-Id: <202507021841.562IffIP093603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 79dea0c8af4e - main - linker: Fix the ifunc symbol value calculation for ET_REL files 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79dea0c8af4eeb394c6db6ce62a4da77177bd234 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=79dea0c8af4eeb394c6db6ce62a4da77177bd234 commit 79dea0c8af4eeb394c6db6ce62a4da77177bd234 Author: Mark Johnston AuthorDate: 2025-07-02 18:38:20 +0000 Commit: Mark Johnston CommitDate: 2025-07-02 18:41:06 +0000 linker: Fix the ifunc symbol value calculation for ET_REL files Reported by: cy Fixes: aefae931820f ("linker: Improve handling of ifuncs when fetching symbol metadata") --- sys/kern/link_elf_obj.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 3d18aed2b1c0..151aab96f9be 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -1514,19 +1514,17 @@ static void link_elf_ifunc_symbol_value(linker_file_t lf, caddr_t *valp, size_t *sizep) { c_linker_sym_t sym; - elf_file_t ef; const Elf_Sym *es; caddr_t val; long off; val = *valp; - ef = (elf_file_t)lf; /* Provide the value and size of the target symbol, if available. */ val = ((caddr_t (*)(void))val)(); if (link_elf_search_symbol(lf, val, &sym, &off) == 0 && off == 0) { es = (const Elf_Sym *)sym; - *valp = (caddr_t)ef->address + es->st_value; + *valp = (caddr_t)es->st_value; *sizep = es->st_size; } else { *valp = val;