From nobody Mon Jan 12 17:18:44 2026 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 4dqfH927s3z6NrPN for ; Mon, 12 Jan 2026 17:18:45 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqfH84wk6z40ZQ for ; Mon, 12 Jan 2026 17:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238324; 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=2l6gFrEmAg0MJZ5BoWPJ1Hztc9d56SdCs6yj51zW3gQ=; b=kmmIR80AF2PL7UVOOURKImrZO69D768L0BsZa7AuJzAM6XV84B2xaD80Ptb9jDI8XcL2Gm 5jK6yk9Qm5UhQm4pDCVtupdp5zKSd+fbmqO+WJKuIRpAzR0fOmII8XRKc6vYISSuMeLdJR l0AyskhCiaLpldHYhnEkBB8DNuA850hbJh6N2H/GdwmM2U1YT+3gUXYfmHZn7qORVVcfvP av3TVmwfoDn87gQyqtAbjbO/jZCvmiIKt4R7ZqmVOg7y2EIfP/X3nrdYpIPYrFhOP7hmZB gThnY5ENvcpYC/CIyY45YPg0CFiemSsrgUDgyXLBgIlGeAYRQ38nGHal7GzpLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238324; 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=2l6gFrEmAg0MJZ5BoWPJ1Hztc9d56SdCs6yj51zW3gQ=; b=BR2K00+xG+l9IBO1pBxod81rKF0bkca5Nzpjj4GKuRmoV0sB4a4aBK73fU4Yv9A3zs8ffO EAaursxzimIyF1CXW1BCfwwoLrFp1vvrIucYqgwc+w7eZytfmJdpJhsnK7k9I/MJiJIcVV hjh2Ih44dg1P//b4cv+371B52cNcJukFq0o4hcQX8Av05fgg2JsmOocuOjSkU6DMlxRF4X nZ8gq22gXebpGaK6hzgiGVQwDsjQ2JbziJaopfd8iq087mmKrPOmo0TmyuPLfe1vytZE+S VV2gVVGtXepjiKEcC00AjA2bC9zuDhk2N5NvRpPBQpQufpIV+X6IIqGyke4WMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238324; a=rsa-sha256; cv=none; b=mPDLNQyjcoPfyJodMZ5em6C1R/PcKFtOMP7chNBiGeQzer67pTm+rGfts/fF+9EMqPc4iT zlrOD+HvXSgKCSCFd9UhZzaDcAh+80KXfy4IEzGA1R34z/jCkfuH60qcDdacFpII/AlLq+ evZs2FSoN8gDkKnSCU1KqjrPzVK0fVE2B71RZmTlxOinL/vLTfOxCSq9ovXdORo1zXUoz/ CUWcYtiBPrTcw4UxuHWLM1BovgOf43bfAjySnOdCn31RL34RjSQa7DCOEx8nMVG6hqTzAH u/YGjfkP2MtsrnSbJjbfuP6fYK04hDTPyF8kARsDqRcLoswDgPzMfF91WMexaQ== 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 4dqfH84SsMzbph for ; Mon, 12 Jan 2026 17:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 357ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:18:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 08e7bdaf18b9 - stable/15 - libgeom: Fix segfault in 32-on-64 case 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 08e7bdaf18b9d452501772cf7914a252363cba61 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:18:44 +0000 Message-Id: <69652cf4.357ea.32ea88d6@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=08e7bdaf18b9d452501772cf7914a252363cba61 commit 08e7bdaf18b9d452501772cf7914a252363cba61 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-12 17:18:22 +0000 libgeom: Fix segfault in 32-on-64 case We were using strtoul() to parse object identifiers, which are kernel pointers. This works fine as long as the kernel and userland match, but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX for all objects, resulting in memory corruption when we later pick the wrong object while resolving consumer-producer references. MFC after: 1 week PR: 292127 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54452 (cherry picked from commit 27894e20f140ee2729c14b589035870c8185b87d) --- lib/libgeom/geom_xml2tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 2d2c43e29e77..161425d9fadf 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -76,10 +76,10 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (!strcmp(attr[i], "id")) { - id = (void *)strtoul(attr[i + 1], NULL, 0); + id = (void *)strtoumax(attr[i + 1], NULL, 0); mt->nident++; } else if (!strcmp(attr[i], "ref")) { - ref = (void *)strtoul(attr[i + 1], NULL, 0); + ref = (void *)strtoumax(attr[i + 1], NULL, 0); } else printf("%*.*s[%s = %s]\n", mt->level + 1, mt->level + 1, "",