diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-19 23:30:40 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-19 23:30:40 +0100 |
| commit | c7a84af651ae5cf2588c4a057564f9c2189846ef (patch) | |
| tree | 65e1e0349703b3c8ab88748107d054584e71a470 /x86_64 | |
| parent | 569df850cd7badd1e36132ad3b44aa76a4d27c25 (diff) | |
| download | gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.tar.gz gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.tar.bz2 gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.zip | |
Rename msg_is_misaligned and msg_align
message.h is installed so we need to hide these behind a mach_ prefix
Diffstat (limited to 'x86_64')
| -rw-r--r-- | x86_64/copy_user.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/x86_64/copy_user.c b/x86_64/copy_user.c index 34fe5212..b340d6f0 100644 --- a/x86_64/copy_user.c +++ b/x86_64/copy_user.c @@ -149,8 +149,8 @@ size_t msg_usize(const mach_msg_header_t *kmsg) size_t n = descsize_to_bytes(size); saddr += n*number; usize += n*number; - saddr = msg_align(saddr); - usize = msg_align(usize); + saddr = mach_msg_align(saddr); + usize = mach_msg_align(usize); } } else @@ -201,8 +201,8 @@ int copyinmsg (const void *userbuf, void *kernelbuf, const size_t usize) mach_msg_type_size_t size; mach_msg_type_number_t number; boolean_t is_inline; - usaddr = msg_align(usaddr); - ksaddr = msg_align(ksaddr); + usaddr = mach_msg_align(usaddr); + ksaddr = mach_msg_align(ksaddr); if (copyin_unpack_msg_type(usaddr, ksaddr, &name, &size, &number, &is_inline, &amount)) return 1; @@ -238,8 +238,8 @@ int copyinmsg (const void *userbuf, void *kernelbuf, const size_t usize) return 1; usaddr += n*number; ksaddr += n*number; - usaddr = msg_align(usaddr); - ksaddr = msg_align(ksaddr); + usaddr = mach_msg_align(usaddr); + ksaddr = mach_msg_align(ksaddr); } } else @@ -261,7 +261,7 @@ int copyinmsg (const void *userbuf, void *kernelbuf, const size_t usize) } kmsg->msgh_size = sizeof(mach_msg_header_t) + ksaddr - (vm_offset_t)(kmsg + 1); - kmsg->msgh_size = msg_align(kmsg->msgh_size); + kmsg->msgh_size = mach_msg_align(kmsg->msgh_size); return 0; } @@ -295,8 +295,8 @@ int copyoutmsg (const void *kernelbuf, void *userbuf, const size_t ksize) mach_msg_type_size_t size; mach_msg_type_number_t number; boolean_t is_inline; - usaddr = msg_align(usaddr); - ksaddr = msg_align(ksaddr); + usaddr = mach_msg_align(usaddr); + ksaddr = mach_msg_align(ksaddr); amount = unpack_msg_type(ksaddr, &name, &size, &number, &is_inline); // TODO: optimize and bring here type adjustment?? vm_offset_t utaddr=usaddr, ktaddr=ksaddr; @@ -328,8 +328,8 @@ int copyoutmsg (const void *kernelbuf, void *userbuf, const size_t ksize) return 1; usaddr += n*number; ksaddr += n*number; - usaddr = msg_align(usaddr); - ksaddr = msg_align(ksaddr); + usaddr = mach_msg_align(usaddr); + ksaddr = mach_msg_align(ksaddr); } } else @@ -353,7 +353,7 @@ int copyoutmsg (const void *kernelbuf, void *userbuf, const size_t ksize) mach_msg_size_t usize; usize = sizeof(mach_msg_user_header_t) + usaddr - (vm_offset_t)(umsg + 1); - usize = msg_align(usize); + usize = mach_msg_align(usize); if (copyout(&usize, &umsg->msgh_size, sizeof(kmsg->msgh_size))) return 1; |