Skip to content

Commit dfab6ef

Browse files
Andrew Boieandrewboie
authored andcommitted
kernel: fix 64-bit issues in syscall_handler.h
Always use size_t for size calculations, not u32_t. Signed-off-by: Andrew Boie <[email protected]>
1 parent b5c6810 commit dfab6ef

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

include/syscall_handler.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ extern int z_user_string_copy(char *dst, const char *src, size_t maxlen);
316316
#define Z_SYSCALL_MEMORY(ptr, size, write) \
317317
Z_SYSCALL_VERIFY_MSG(arch_buffer_validate((void *)ptr, size, write) \
318318
== 0, \
319-
"Memory region %p (size %u) %s access denied", \
320-
(void *)(ptr), (u32_t)(size), \
319+
"Memory region %p (size %zu) %s access denied", \
320+
(void *)(ptr), (size_t)(size), \
321321
write ? "write" : "read")
322322

323323
/**
@@ -354,12 +354,12 @@ extern int z_user_string_copy(char *dst, const char *src, size_t maxlen);
354354

355355
#define Z_SYSCALL_MEMORY_ARRAY(ptr, nmemb, size, write) \
356356
({ \
357-
u32_t product; \
358-
Z_SYSCALL_VERIFY_MSG(!u32_mul_overflow((u32_t)(nmemb), \
359-
(u32_t)(size), \
360-
&product), \
361-
"%ux%u array is too large", \
362-
(u32_t)(nmemb), (u32_t)(size)) || \
357+
size_t product; \
358+
Z_SYSCALL_VERIFY_MSG(!size_mul_overflow((size_t)(nmemb), \
359+
(size_t)(size), \
360+
&product), \
361+
"%zux%zu array is too large", \
362+
(size_t)(nmemb), (size_t)(size)) || \
363363
Z_SYSCALL_MEMORY(ptr, product, write); \
364364
})
365365

0 commit comments

Comments
 (0)