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>

diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c
index e9a6a7ea453e08b1cc7d12ced89eb2f6dedb6ff1..59e6a5c1f6b20750108fd3a5ae0ceb9bbe405b61 100644 (file)
--- a/hurd/hurdioctl.c
+++ b/hurd/hurdioctl.c
@@ -311,7 +311,7 @@ static int
 siocgifconf (int fd, int request, struct ifconf *ifc)
 {
   error_t err;
-  size_t data_len = ifc->ifc_len;
+  mach_msg_type_number_t data_len = ifc->ifc_len;
   char *data = ifc->ifc_buf;
 
   if (data_len <= 0)

diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c
index dbeb272bdcb332e45a20138ee56f642c9c55451f..954d3987f17fc822e489941ff404d7535b11265b 100644 (file)
--- a/hurd/hurdprio.c
+++ b/hurd/hurdprio.c
@@ -58,7 +58,7 @@ _hurd_priority_which_map (enum __priority_which which, int who,
          int *oldpi = pi;
          mach_msg_type_number_t oldpisize = pisize;
          char *tw = 0;
-         size_t twsz = 0;
+         mach_msg_type_number_t twsz = 0;
          err = __USEPORT (PROC, __proc_getprocinfo (port, pids[i],
                                                     &pi_flags,
                                                     &pi, &pisize,

diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index 0d344026e40b31364693208636be18ba939f900d..8850c4fd27bcfe72c07fba4046e5368cb7f8c84f 100644 (file)
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -162,7 +162,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
                            {
                              char buf[1024];
                              char *trans = buf;
-                             size_t translen = sizeof buf;
+                             mach_msg_type_number_t translen = sizeof buf;
                              err = __file_get_translator (*result,
                                                           &trans, &translen);
                              if (!err

diff --git a/hurd/xattr.c b/hurd/xattr.c
index f98e548c19129abb7b3f88ee115d0f40336fa380..48914bcf26f28a24f56ce5ac31b684f2a801db62 100644 (file)
--- a/hurd/xattr.c
+++ b/hurd/xattr.c
@@ -60,7 +60,7 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size)
   if (!strcmp (name, "translator"))
     {
       char *buf = value;
-      size_t bufsz = value ? *size : 0;
+      mach_msg_type_number_t bufsz = value ? *size : 0;
       error_t err = __file_get_translator (port, &buf, &bufsz);
       if (err)
        return err;
@@ -144,7 +144,7 @@ _hurd_xattr_set (io_t port, const char *name, const void *value, size_t size,
        {
          /* Must make sure it's already there.  */
          char *buf = NULL;
-         size_t bufsz = 0;
+         mach_msg_type_number_t bufsz = 0;
          error_t err = __file_get_translator (port, &buf, &bufsz);
          if (err)
            return err;

diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
index fc5e78e7d3c6bbd4fccd22cea4b83e93f595aee9..f24b35b380709457643938c023330040b8c5c856 100644 (file)
--- a/sysdeps/mach/hurd/getcwd.c
+++ b/sysdeps/mach/hurd/getcwd.c
@@ -117,7 +117,7 @@ __hurd_canonicalize_directory_name_internal (file_t thisdir,
       int mount_point;
       file_t newp;
       char *dirdata;
-      size_t dirdatasize;
+      mach_msg_type_number_t dirdatasize;
       int direntry, nentries;
 
 

diff --git a/sysdeps/mach/hurd/readlinkat.c b/sysdeps/mach/hurd/readlinkat.c
index dabdbb371393694e2d284ba624e7beb46ec06713..5bb8b7537123ee686985367236ba659c55456f23 100644 (file)
--- 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);
     }
 
 

diff --git a/sysdeps/mach/hurd/sendfile64.c b/sysdeps/mach/hurd/sendfile64.c
index 658b02826d5209eb335ae5b01570e22e4e503357..e36b979078ecd7aee9a4e40df7f4ab8cff21040c 100644 (file)
--- a/sysdeps/mach/hurd/sendfile64.c
+++ b/sysdeps/mach/hurd/sendfile64.c
@@ -35,7 +35,7 @@ __sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count)
      which might blow if it's huge or address space is real tight.  */
 
   char *data = 0;
-  size_t datalen = 0;
+  mach_msg_type_number_t datalen = 0;
   error_t err = HURD_DPORT_USE (in_fd,
                                __io_read (port, &data, &datalen,
                                           offset ? *offset : (off_t) -1,