[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd,commited] hurd: Make __getrandom_early_init call __mach_init
From: |
Samuel Thibault |
Subject: |
[hurd,commited] hurd: Make __getrandom_early_init call __mach_init |
Date: |
Mon, 9 Jun 2025 15:47:41 +0200 |
25d37948c9f3 ("malloc: Improve malloc initialization") moved calling malloc
initialization earlier, within _dl_sysdep_start's call to dl_main, before
__mach_init is called by _dl_init_first. But malloc initialization uses
getrandom, which needs to make RPCs.
This adds __getrandom_early_init on hurd to express that getrandom needs
__mach_init too. This also adds a guard to avoid making it create several task
and host ports.
Fixes: 25d37948c9f3 ("malloc: Improve malloc initialization")
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
mach/mach_init.c | 4 ++++
sysdeps/mach/hurd/getrandom-internal.h | 30 ++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100644 sysdeps/mach/hurd/getrandom-internal.h
diff --git a/mach/mach_init.c b/mach/mach_init.c
index 9b05e4e175..6237e9c8e4 100644
--- a/mach/mach_init.c
+++ b/mach/mach_init.c
@@ -35,6 +35,10 @@ __mach_init (void)
{
kern_return_t err;
+ if (__mach_host_self_)
+ /* Already initialized. */
+ return;
+
__mach_task_self_ = (__mach_task_self) ();
__mach_host_self_ = (__mach_host_self) ();
__mig_init (0);
diff --git a/sysdeps/mach/hurd/getrandom-internal.h
b/sysdeps/mach/hurd/getrandom-internal.h
new file mode 100644
index 0000000000..8bd718b7c1
--- /dev/null
+++ b/sysdeps/mach/hurd/getrandom-internal.h
@@ -0,0 +1,30 @@
+/* Internal definitions for Hurd getrandom implementation.
+ Copyright (C) 2024-2025 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/>. */
+
+#ifndef _GETRANDOM_INTERNAL_H
+#define _GETRANDOM_INTERNAL_H
+
+extern void __mach_init (void);
+
+static inline void __getrandom_early_init (_Bool initial)
+{
+ /* getrandom needs RPCs for time etc. */
+ __mach_init ();
+}
+
+#endif
--
2.47.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [hurd,commited] hurd: Make __getrandom_early_init call __mach_init,
Samuel Thibault <=