public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Define __mig_strlen to support dynamically sized strings in hurd RPCs
@ 2023-05-01 0:24 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2023-05-01 0:24 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=eb14819c14d190830df673c9a3089d82d6b7b8f7
commit eb14819c14d190830df673c9a3089d82d6b7b8f7
Author: Flavio Cruz <flaviocruz@gmail.com>
Date: Sun Apr 30 20:09:49 2023 -0400
Define __mig_strlen to support dynamically sized strings in hurd RPCs
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>
Diff:
---
mach/Makefile | 2 +-
mach/Versions | 1 +
mach/mach/mig_support.h | 1 +
mach/mig_strlen.c | 26 ++++++++++++++++++++++++++
sysdeps/mach/include/mach/mig_support.h | 3 ++-
5 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/mach/Makefile b/mach/Makefile
index 39358fdb83..a5d1252f95 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -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-headers = lock-intern.h spin-lock.h
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 \
msg-destroy msgserver \
mach_error errstring error_compat errsystems \
diff --git a/mach/Versions b/mach/Versions
index b525cfdcf9..72e9d557db 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -71,5 +71,6 @@ libc {
GLIBC_PRIVATE {
# functions used by RPC stubs
__mig_memcpy;
+ __mig_strlen;
}
}
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h
index 78d4c4f0e3..c43fa953f8 100644
--- a/mach/mach/mig_support.h
+++ b/mach/mach/mig_support.h
@@ -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 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 */
diff --git a/mach/mig_strlen.c b/mach/mig_strlen.c
new file mode 100644
index 0000000000..3c5ef8db15
--- /dev/null
+++ b/mach/mig_strlen.c
@@ -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);
+}
diff --git a/sysdeps/mach/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h
index 1888d481d2..242f310a9c 100644
--- a/sysdeps/mach/include/mach/mig_support.h
+++ b/sysdeps/mach/include/mach/mig_support.h
@@ -9,10 +9,11 @@ libc_hidden_proto (__mig_init)
# include <libc-symbols.h>
# 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
libc.so. */
# define memcpy(dest, src, n) __mig_memcpy(dest, src, n)
+# define strlen(src) __mig_strlen(src)
# endif
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-01 0:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-01 0:24 [glibc] Define __mig_strlen to support dynamically sized strings in hurd RPCs Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).