michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: fix 64-bit issues in syscall_handler.h

Browse source 
Always use size_t for size calculations, not u32_t.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-11-21 18:56:02 -08:00 • committed by Andrew Boie
commit dfab6ef940
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/syscall_handler.h
View file

@ -316,8 +316,8 @@ extern int z_user_string_copy(char *dst, const char *src, size_t maxlen);
#define Z_SYSCALL_MEMORY(ptr, size, write) \ #define Z_SYSCALL_MEMORY(ptr, size, write) \
Z_SYSCALL_VERIFY_MSG(arch_buffer_validate((void *)ptr, size, write) \ Z_SYSCALL_VERIFY_MSG(arch_buffer_validate((void *)ptr, size, write) \
== 0, \ == 0, \
"Memory region %p (size %u) %s access denied", \ "Memory region %p (size %zu) %s access denied", \
(void *)(ptr), (u32_t)(size), \ (void *)(ptr), (size_t)(size), \
write ? "write" : "read") write ? "write" : "read")
/** /**
@ -354,12 +354,12 @@ extern int z_user_string_copy(char *dst, const char *src, size_t maxlen);
#define Z_SYSCALL_MEMORY_ARRAY(ptr, nmemb, size, write) \ #define Z_SYSCALL_MEMORY_ARRAY(ptr, nmemb, size, write) \
({ \ ({ \
u32_t product; \ size_t product; \
Z_SYSCALL_VERIFY_MSG(!u32_mul_overflow((u32_t)(nmemb), \ Z_SYSCALL_VERIFY_MSG(!size_mul_overflow((size_t)(nmemb), \
(u32_t)(size), \ (size_t)(size), \
&product), \ &product), \
"%ux%u array is too large", \ "%zux%zu array is too large", \
(u32_t)(nmemb), (u32_t)(size)) || \ (size_t)(nmemb), (size_t)(size)) || \
Z_SYSCALL_MEMORY(ptr, product, write); \ Z_SYSCALL_MEMORY(ptr, product, write); \
}) })