From nobody Fri Aug 15 22:21:51 2025 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 4c3c673Vxkz64NWl; Fri, 15 Aug 2025 22:21:51 +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 4c3c6725jXz3ntL; Fri, 15 Aug 2025 22:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755296511; 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=uShPUvsFIq6PVQ94BpvH3nUPuyfmPbL40Ee06Z8Qw4w=; b=WHZotnMiphU4Fh8VPjSdtNb3eP5lVQr/zbZNiOgCPFeP/hZwSbrOjkEfekiOk3W+U8WZwP +mjWQduRQapd7MpKFEre9pX06KxEjHBwpjObYuT6aRA9pJd6RGV5RjhQIVetaUp3OCSesb FrMmhNdsjza870q73M251kZqdXdaXzLQXqGRsolygB5aWjRp+/l6bkwoh0Nt3lPTlU9VkN Wbqu21P8fdl9sgekLIn0PNciwZtAx3X6/L0IwFQkBR/g3Xb3cxHXdbSGmZlU+IC70LLOhn T8UKR2SWKAbRBMxlrLvjYkLsdTXzDa0apxxbqqmzAW21gTpz6e49HJw5hrYtcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755296511; 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=uShPUvsFIq6PVQ94BpvH3nUPuyfmPbL40Ee06Z8Qw4w=; b=xgfkEGMI4NJaDWqaHj11lukwTWE/P/XAbStJyQ6kr7H+u2qMck3BxPNpUlRIwanGJgq58L A5F1UpyKniBw8xU6XiLQWuxbNK6lfTMWtyF5VuRJSyIwiRrqjthxz0QXban4BCSlSjep7o QA0cCJWKszzF50vnW6Qzoqyz5vkPcIAKfVweQ7M+DEgagTG7s4s1cfY3mfw/FbizRzmcdz d8Q7loakJ5tDw/R47rVaPJ/Kn/8x3cTR01VLYAFWUhT2Ldv0nBFMqWUR1M5e0q89FRzHWz rRgDf4qicxQiZXyrmOtaCI7vSa2kxE+ea6sIG+X55U67+uL2/nEvae0P/BJBpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755296511; a=rsa-sha256; cv=none; b=GpZp1rYw5n1nz/4MK3EK3h2KJY+t+0g2b4NlmstiAJtQDtvMsNr5GnLn+05KhrfVOtuDZA 0sZGMhU1kHp5t1aHHmsYynxt90tVyXP5MebDek1/c5cc+aD9/8Ww4/AyPzzyP+MLafEWEz huZPSdw3N61qZ2A+s7TBjBzZ1Fg3OAJZEJfg9ZzcQH7/Ot8URwxgeSYdMQtTJIiBpw8/2L OvE/6Lt5mGu4QnCuGfyGNSKryRkHrHVA+Z1SKsXcZyKxRcxyo6k52713XFLwMuJdPHlRNF AIuxfzYLluGonfEWG429adyEMpvg7PBZjrRzKmCmVcmZbgRlPlctiNftfCZFDg== 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 4c3c671Wy4zxC0; Fri, 15 Aug 2025 22:21:51 +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 57FMLp86096169; Fri, 15 Aug 2025 22:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FMLpPL096166; Fri, 15 Aug 2025 22:21:51 GMT (envelope-from git) Date: Fri, 15 Aug 2025 22:21:51 GMT Message-Id: <202508152221.57FMLpPL096166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 6118587172ba - main - rtld-elf: Fix VDSO Obj_Entry mapsize and report in utrace(2) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6118587172babee538fb8e461b9a607ea987e342 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6118587172babee538fb8e461b9a607ea987e342 commit 6118587172babee538fb8e461b9a607ea987e342 Author: Jessica Clarke AuthorDate: 2025-08-15 22:21:35 +0000 Commit: Jessica Clarke CommitDate: 2025-08-15 22:21:35 +0000 rtld-elf: Fix VDSO Obj_Entry mapsize and report in utrace(2) Subtracing addr is only appropriate for position-dependent objects, where vaddrbase would also be the same value. For position-independent objects, like the VDSO (which we already assume due to setting vaddrbase to 0), the segments start at 0, not addr. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51924 --- libexec/rtld-elf/rtld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 17196f55c271..8977d5947010 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3031,7 +3031,7 @@ load_kpreload(const void *addr) } obj->mapbase = __DECONST(caddr_t, addr); - obj->mapsize = segn->p_vaddr + segn->p_memsz - (Elf_Addr)addr; + obj->mapsize = segn->p_vaddr + segn->p_memsz; obj->vaddrbase = 0; obj->relocbase = obj->mapbase; @@ -3060,7 +3060,8 @@ load_kpreload(const void *addr) linkmap_add(obj); /* for GDB & dlinfo() */ max_stack_flags |= obj->stack_flags; - LD_UTRACE(UTRACE_LOAD_OBJECT, obj, obj->mapbase, 0, 0, obj->path); + LD_UTRACE(UTRACE_LOAD_OBJECT, obj, obj->mapbase, obj->mapsize, 0, + obj->path); return (0); }