AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Define __mig_strlen to support dynamically sized strings in hurd RPCs

Browse Source 
We make lib{mach,hurd}user.so only call __mig_strlen which can be
relocated before libc.so is relocated, similar to what is done with
__mig_memcpy.
Message-Id: <ZE8DTRDpY2hpPZlJ@jupiter.tail36e24.ts.net>
This commit is contained in:
Flavio Cruz 2023-04-30 20:09:49 -04:00 committed by Samuel Thibault
parent 6eb3edeed2
commit eb14819c14
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mach/Makefile
View File

@ -25,7 +25,7 @@ headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \
lock = spin-solid spin-lock mutex-init mutex-solid lock = spin-solid spin-lock mutex-init mutex-solid
lock-headers = lock-intern.h spin-lock.h lock-headers = lock-intern.h spin-lock.h
routines = $(mach-syscalls) $(mach-shortcuts) \ routines = $(mach-syscalls) $(mach-shortcuts) \
mach_init mig_strncpy mig_memcpy msg \ mach_init mig_strncpy mig_strlen mig_memcpy msg \
mig-alloc mig-dealloc mig-reply \ mig-alloc mig-dealloc mig-reply \
msg-destroy msgserver \ msg-destroy msgserver \
mach_error errstring error_compat errsystems \ mach_error errstring error_compat errsystems \

1
mach/Versions
View File

@ -71,5 +71,6 @@ libc {
GLIBC_PRIVATE { GLIBC_PRIVATE {
# functions used by RPC stubs # functions used by RPC stubs
__mig_memcpy; __mig_memcpy;
__mig_strlen;
} }
} }

1
mach/mach/mig_support.h
View File

@ -55,5 +55,6 @@ extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len);
extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t);
extern void *__mig_memcpy (void *__dst, const void *__src, vm_size_t __len); extern void *__mig_memcpy (void *__dst, const void *__src, vm_size_t __len);
extern vm_size_t __mig_strlen (const char *__src);
#endif /* mach/mig_support.h */ #endif /* mach/mig_support.h */

26
mach/mig_strlen.c Normal file
View File

@ -0,0 +1,26 @@
/* strlen stub for mig stubs in libmachuser and libhurduser.
Copyright (C) 2023 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <mach.h>
#include <string.h>
vm_size_t
__mig_strlen (const char *src)
{
return strlen (src);
}

3
sysdeps/mach/include/mach/mig_support.h
View File

@ -9,10 +9,11 @@ libc_hidden_proto (__mig_init)
# include <libc-symbols.h> # include <libc-symbols.h>
# if defined USE_MULTIARCH && (IS_IN (libmachuser) || IS_IN (libhurduser)) # if defined USE_MULTIARCH && (IS_IN (libmachuser) || IS_IN (libhurduser))
/* Avoid directly calling ifunc-enabled memcpy or strpcpy, /* Avoid directly calling ifunc-enabled memcpy or strlen,
because they would introduce a relocation loop between lib*user and because they would introduce a relocation loop between lib*user and
libc.so. */ libc.so. */
# define memcpy(dest, src, n) __mig_memcpy(dest, src, n) # define memcpy(dest, src, n) __mig_memcpy(dest, src, n)
# define strlen(src) __mig_strlen(src)
# endif # endif
#endif #endif