From 6a2664b126bc6acccac45f7c2864df36d0624728 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 3 Nov 2024 23:42:22 +0100 Subject: [PATCH] lib: uuid: fix uuid_str_to_bin() on 32-bit hextoul() cannot convert a string to a 64-bit number on a 32-bit system. Use function hextoull() instead. Reported-by: Patrick Delaunay Fixes: 22c48a92cdce ("lib: uuid: supporting building as part of host tools") Signed-off-by: Heinrich Schuchardt Reviewed-by: Caleb Connolly Reviewed-by: Ilias Apalodimas Tested-by: Patrick Delaunay Reviewed-by: Patrick Delaunay --- lib/uuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uuid.c b/lib/uuid.c index 19f33dd147..538a1ba6aa 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -313,7 +313,7 @@ int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin, tmp16 = cpu_to_be16(hextoul(uuid_str + 19, NULL)); memcpy(uuid_bin + 8, &tmp16, 2); - tmp64 = cpu_to_be64(hextoul(uuid_str + 24, NULL)); + tmp64 = cpu_to_be64(hextoull(uuid_str + 24, NULL)); memcpy(uuid_bin + 10, (char *)&tmp64 + 2, 6); return 0; -- 2.39.5