From nobody Sat Jan 3 09:10:40 2026 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 4djvt85X8Bz6LxCq for ; Sat, 03 Jan 2026 09:10:40 +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 4djvt83ty0z3Jgf for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; 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=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=jPJYRWZUiyYnaBiSfzbPP5kWHtNcV1vkc/iuCxEKYUtE+LsBWbLdmvgb4VmvChvcV9lH0u QpgoWXd4ky6oEcIJuw6il3MHlbRrAfDGjMGbyblcdhN4pW577dSchfuQFpUwkbohuBIuAG TNh6dbWsXe7P16q1u+/9ATZBMCzrWSrT/IoRUoymCXVGMQBDEASLOdaq1QKINWda0klFeu zAv4cDYSLYKtQ0Xm65O5t9y9ejPMetd/jHsbksUMX2GIqVKf+zHbUy6Ile/xX+gSOvQS0x ey3rLQmMp80VpHJIcoYoDm4aPtwznnGb/hA/6RMIT4S6FQwZ1WNYOwSYC9qZpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; 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=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=wUplWjNEoqRqzbZkYqCTV5xUo198mosI8Gp8CNiRHwdlhLlInx/KCNR175orJyugHXNtyW hHfgYPBJIJUf6dggWfx4SEnYug7BiwSmaKHfWPKZkxznywLmq7vVMod0njINuS3Ji0PgpE 5W4qIHJ+H4gk9gRvaU7gYG9GNO8gaKzcnuA7ozkxSLy+j8Anr43er97SwtBFZdadTZsg+5 9rdl4DHIjDOn13VUZ8dSVXcofiC9pXpv6EKzik2ME5IDeU3kqOldDvgWvd2xHH2zOjVFDT IIWPdUzArry9RPsuz2Z08tmp1kLjl23n693EhDs6Y5LNja8qrwYb8v6yrCibWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431440; a=rsa-sha256; cv=none; b=oMHr5zsaQZ/iLOChHKWAF/nVHPmtJQYp22hndD2M+xKvS/v1hyJJT1fC/0qecoSJNFQFYP M49l8S/RNDVymAwXHIBqlGhy9hZlcVZAcKqnwg8HlQbFcyFvqvLrZ6q6xDE36rAx1VumcA BG3IiIVw4+1Lm4RLJFBXgXA0ZctIDsCZs8yRE8zrk95a+H/UgNQQsONW3ZrIFZhKcuJ/Ol 1SNP7djNQ/N7LELHzGNwyamx4cN7QJgdUvJCcgVydn5ccA+GuwDl1eAQevfQ8hpoenltGc rIIPqYPxr0IPdeEex4I8nj082S9oMjvYsDRsw3uan0pBN58SWsg4sA5IYMI3dQ== 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 4djvt83TQ7zwtR for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b4b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 27894e20f140 - main - libgeom: Fix segfault in 32-on-64 case 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27894e20f140ee2729c14b589035870c8185b87d Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:40 +0000 Message-Id: <6958dd10.b4b9.2aebecda@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=27894e20f140ee2729c14b589035870c8185b87d commit 27894e20f140ee2729c14b589035870c8185b87d Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +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 --- 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, "",