Module Name: src
Committed By: joerg
Date: Sun Apr 19 01:06:16 UTC 2020
Modified Files:
src/lib/libc/gen: pthread_atfork.c
src/libexec/ld.elf_so: rtld.c rtld.h symbols.map
Log Message:
Rename __atomic_fork to __locked_fork and give it &errno as argument.
rtld and libc use different storage, so the initial version would
incorrectly report the failure reason for fork().
There is still a small race condition inside ld.elf_so as it doesn't use
thread-safe errno internally, but that's a more contained internal
issue.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/pthread_atfork.c
cvs rdiff -u -r1.204 -r1.205 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.139 -r1.140 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.3 -r1.4 src/libexec/ld.elf_so/symbols.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/pthread_atfork.c
diff -u src/lib/libc/gen/pthread_atfork.c:1.13 src/lib/libc/gen/pthread_atfork.c:1.14
--- src/lib/libc/gen/pthread_atfork.c:1.13 Thu Apr 16 14:39:58 2020
+++ src/lib/libc/gen/pthread_atfork.c Sun Apr 19 01:06:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_atfork.c,v 1.13 2020/04/16 14:39:58 joerg Exp $ */
+/* $NetBSD: pthread_atfork.c,v 1.14 2020/04/19 01:06:15 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_atfork.c,v 1.13 2020/04/16 14:39:58 joerg Exp $");
+__RCSID("$NetBSD: pthread_atfork.c,v 1.14 2020/04/19 01:06:15 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -48,10 +48,10 @@ __weak_alias(fork, _fork)
#endif /* __weak_alias */
pid_t __fork(void); /* XXX */
-pid_t __atomic_fork(void) __weak; /* XXX */
+pid_t __locked_fork(int *) __weak; /* XXX */
pid_t
-__atomic_fork(void)
+__locked_fork(int *my_errno)
{
return __fork();
}
@@ -164,7 +164,7 @@ fork(void)
SIMPLEQ_FOREACH(iter, &prepareq, next)
(*iter->fn)();
- ret = __atomic_fork();
+ ret = __locked_fork(&errno);
if (ret != 0) {
/*
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.204 src/libexec/ld.elf_so/rtld.c:1.205
--- src/libexec/ld.elf_so/rtld.c:1.204 Thu Apr 16 14:39:58 2020
+++ src/libexec/ld.elf_so/rtld.c Sun Apr 19 01:06:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.204 2020/04/16 14:39:58 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.205 2020/04/19 01:06:15 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.204 2020/04/16 14:39:58 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.205 2020/04/19 01:06:15 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1535,13 +1535,15 @@ __dl_cxa_refcount(void *addr, ssize_t de
pid_t __fork(void);
__dso_public pid_t
-__atomic_fork(void)
+__locked_fork(int *my_errno)
{
sigset_t mask;
pid_t result;
_rtld_exclusive_enter(&mask);
result = __fork();
+ if (result == -1)
+ *my_errno = errno;
_rtld_exclusive_exit(&mask);
return result;
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.139 src/libexec/ld.elf_so/rtld.h:1.140
--- src/libexec/ld.elf_so/rtld.h:1.139 Thu Apr 16 14:39:58 2020
+++ src/libexec/ld.elf_so/rtld.h Sun Apr 19 01:06:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.139 2020/04/16 14:39:58 joerg Exp $ */
+/* $NetBSD: rtld.h,v 1.140 2020/04/19 01:06:15 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -370,7 +370,7 @@ __dso_public int dl_iterate_phdr(int (*)
__dso_public void *_dlauxinfo(void) __pure;
__dso_public void __dl_cxa_refcount(void *addr, ssize_t delta);
-__dso_public pid_t __atomic_fork(void);
+__dso_public pid_t __locked_fork(int *);
#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
/*
Index: src/libexec/ld.elf_so/symbols.map
diff -u src/libexec/ld.elf_so/symbols.map:1.3 src/libexec/ld.elf_so/symbols.map:1.4
--- src/libexec/ld.elf_so/symbols.map:1.3 Thu Apr 16 14:39:58 2020
+++ src/libexec/ld.elf_so/symbols.map Sun Apr 19 01:06:15 2020
@@ -23,6 +23,6 @@
___tls_get_addr;
__gnu_Unwind_Find_exidx;
__dl_cxa_refcount;
- __atomic_fork;
+ __locked_fork;
local: *;
};
