mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-24 12:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

hurd: Use mach_msg_type_number_t where appropriate

Browse Source 
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>
This commit is contained in:
Sergey Bugaev 2023-02-12 14:10:33 +03:00 committed by Samuel Thibault
parent 8a86e7b6a6
commit f4315054b4
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hurd/hurdioctl.c
View File

@ -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)

2
hurd/hurdprio.c
View File

@ -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,

2
hurd/lookup-retry.c
View File

@ -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

4
hurd/xattr.c
View File

@ -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;

2
sysdeps/mach/hurd/getcwd.c
View File

@ -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;

6
sysdeps/mach/hurd/readlinkat.c
View File

@ -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);
}

2
sysdeps/mach/hurd/sendfile64.c
View File

@ -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,