From nobody Mon Jan 12 17:19:42 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 4dqfJJ1jWwz6NrSl for ; Mon, 12 Jan 2026 17:19:44 +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 4dqfJG2kSrz42Qd for ; Mon, 12 Jan 2026 17:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238382; 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=tpRmw3ysrnBQU4XGEWz+HAmNfrXTEa6wHp4RB1KI3wE=; b=Dt1KiHfjnrjJZNnNTpuZzI1kqv6x9RupXOL7xCxsWpYklN3qhOXEWnt57tkfJSF0eY+McP +VxIbgwhCCWhdjcbntjiB+oTOTbyvpMNyvSBsLgsCzcW2nyRxNGJ4vJYygpl41Nk8ypGn+ IQeBiniz/jn7Cgz6+0uSRpZg8ds221iQkObgVtCErY7W8YVuJIm8xJEBbu40fU2fEJMxoE bzEJ3jadTuGsY3baOaco+JojNvAoRushJqUvxUx/D27wwtFtnH3Ok4YoOt1nAiJMFwrsbS 8rZBYfrncpEg4JF65onA2u3UMmBWHVwQMC+N64FvybbuQ53RxHlDaPozRM03tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238382; 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=tpRmw3ysrnBQU4XGEWz+HAmNfrXTEa6wHp4RB1KI3wE=; b=GmTbOxEurE1ZNHpsYvZT+k95v0gmKz0KybOyAEOlJYNgo67VYdSj9WpCnwSmgl/EM5NTNa e0NumzQfh25RVe2JyE0cm16LHwPdCPC34GyMXME5hqwZVxlGwqvfECOgrOBNoDxdyI+NyN 4wtooCHZdPd1ieKqzC4zQF4iIerAY579IQOTg9ZbviQTQ6zTFMq9rp699szLXuzY5RC6qJ SVuuaDtQUsOvFaCAKYjgEySi6S3M7399AOA8HaeGy63tzDikCMd+Go/DkYpNbC8Hp88Ye2 VoZrPDfI8D1z7UKAefNvIkHD3v5+GHcjZf4xymB1DHM1peDYs2sCmJkamJaeMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238382; a=rsa-sha256; cv=none; b=uWguCtgoRIzy/lfxbXxw/63yyEq8d/WJJY0yjsHP4ySCD7k86knZYUa4rv1SBNjg/qZRaP wjGGZlZ9mELGYUtjs7jRKTwlHP2tuVAdsBwIZTQ4CZmAJg3kmmvnd7SoW0sui9V55Wi8he Y070Srrc8R/fWnYlxjmOaHkF20vcff74K46gco/myoExEATjqQjHhLtpm9VBKQAhtsgx/f f7xUt89/ji7k2vTVX0OG27WF0RixcreoqB1FsJVUXY/ANXnSEwaODVd3MG2OluYxb+eq8f F4cS+Wpxs0+FDeDQ9minoAsfqPBxSnNGCf5NBL4E8cHWr1/KwMe59z3Ibt6aLw== 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 4dqfJG29kCzcBN for ; Mon, 12 Jan 2026 17:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37aba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:19:42 +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: 0ba11021c46a - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 0ba11021c46a84855af445e6b0420dd9b8b36023 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:19:42 +0000 Message-Id: <69652d2e.37aba.4bcade56@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0ba11021c46a84855af445e6b0420dd9b8b36023 commit 0ba11021c46a84855af445e6b0420dd9b8b36023 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-11 02:30:46 +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, "",