diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-11-03 23:42:21 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-11-13 08:14:23 -0600 |
| commit | e5a0cb3eb3900038c1c554a96eb8a2ffb13c36b3 (patch) | |
| tree | 9874cb93648a4b3a41b83aa3b455f398d9811d1c | |
| parent | 8ff37ec010ee228c0f7627b43e225103d9f460db (diff) | |
lib: uuid: fix uuid_str_to_le_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 <patrick.delaunay@foss.st.com>
Fixes: 22c48a92cdce ("lib: uuid: supporting building as part of host tools")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
Tested-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| -rw-r--r-- | lib/uuid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/uuid.c b/lib/uuid.c index c6a27b7d044..19f33dd1477 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -35,6 +35,7 @@ #ifdef USE_HOSTCC /* polyfill hextoul to avoid pulling in strto.c */ #define hextoul(cp, endp) strtoul(cp, endp, 16) +#define hextoull(cp, endp) strtoull(cp, endp, 16) #endif int uuid_str_valid(const char *uuid) @@ -339,7 +340,7 @@ int uuid_str_to_le_bin(const char *uuid_str, unsigned char *uuid_bin) tmp16 = cpu_to_le16(hextoul(uuid_str + 19, NULL)); memcpy(uuid_bin + 8, &tmp16, 2); - tmp64 = cpu_to_le64(hextoul(uuid_str + 24, NULL)); + tmp64 = cpu_to_le64(hextoull(uuid_str + 24, NULL)); memcpy(uuid_bin + 10, &tmp64, 6); return 0; |