diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-01-03 10:09:51 +0100 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-01-11 02:30:46 +0000 |
| commit | 0ba11021c46a84855af445e6b0420dd9b8b36023 (patch) | |
| tree | 42a47905bf73909c2e15023009115dd07d7830cd | |
| parent | 90f57724ef55da23b255b3e1aa12f2dc4f3f375c (diff) | |
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)
| -rw-r--r-- | lib/libgeom/geom_xml2tree.c | 4 |
1 files 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, "", |