about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/readlinkat.c
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2023-02-12 14:10:33 +0300
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-02-12 15:52:07 +0100
commitf4315054b46d5e58b44a709a51943fb73f846afb (patch)
tree08dd446b613f6549260c17b3060453fa040eb4d8 /sysdeps/mach/hurd/readlinkat.c
parent8a86e7b6a67f21294ada5bf67f3484ae3e134848 (diff)
downloadglibc-f4315054b46d5e58b44a709a51943fb73f846afb.tar.gz
glibc-f4315054b46d5e58b44a709a51943fb73f846afb.tar.xz
glibc-f4315054b46d5e58b44a709a51943fb73f846afb.zip
hurd: Use mach_msg_type_number_t where appropriate
It has been decided that on x86_64, mach_msg_type_number_t stays 32-bit.
Therefore, it's not possible to use mach_msg_type_number_t
interchangeably with size_t, in particular this breaks when a pointer to
a variable is passed to a MIG routine.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230212111044.610942-3-bugaevc@gmail.com>
Diffstat (limited to 'sysdeps/mach/hurd/readlinkat.c')
-rw-r--r--sysdeps/mach/hurd/readlinkat.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/readlinkat.c b/sysdeps/mach/hurd/readlinkat.c
index dabdbb3713..5bb8b75371 100644
--- a/sysdeps/mach/hurd/readlinkat.c
+++ b/sysdeps/mach/hurd/readlinkat.c
@@ -35,6 +35,7 @@ __readlinkat (int fd, const char *file_name, char *buf, size_t len)
   char retryname[1024];
   file_t file;
   char *rbuf = buf;
+  mach_msg_type_number_t nread = len;
 
   file_stat = __file_name_lookup_at (fd, 0, file_name, O_NOLINK, 0);
   if (file_stat == MACH_PORT_NULL)
@@ -59,15 +60,16 @@ __readlinkat (int fd, const char *file_name, char *buf, size_t len)
       goto out;
     }
 
-  err = __io_read (file, &rbuf, &len, 0, len);
+  err = __io_read (file, &rbuf, &nread, 0, len);
   __mach_port_deallocate (__mach_task_self (), file);
   if (err)
     goto out;
 
+  len = nread;
   if (rbuf != buf)
     {
       memcpy (buf, rbuf, len);
-      __vm_deallocate (__mach_task_self (), (vm_address_t) rbuf, len);
+      __vm_deallocate (__mach_task_self (), (vm_address_t) rbuf, nread);
     }