system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 16:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libc: split libc and syscall interposing (2/2)

Browse source 
Move the __libc_interposing implementation to libc/gen so it doesn't end
up in libsys.

Reviewed by:	kib, emaste, imp
Pull Request:	https://github.com/freebsd/freebsd-src/pull/908
This commit is contained in:
Brooks Davis 2024-01-16 22:51:40 +00:00
parent 9cbd96582c
commit 228d8c9efe
5 changed files with 59 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/libc/gen/Makefile.inc
View file

@ -98,6 +98,7 @@ SRCS+= __getosreldate.c \
kqueue1.c \
lcong48.c \
libc_dlopen.c \
libc_interposing_table.c \
lockf.c \
lrand48.c \
memalign.c \

2
lib/libc/gen/Symbol.map
View file

@ -567,6 +567,8 @@ FBSDprivate_1.0 {
__waitpid;
_waitpid;
__libc_interposing_slot;
_libc_sem_init_compat;
_libc_sem_destroy_compat;
_libc_sem_open_compat;

56
lib/libc/gen/libc_interposing_table.c Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright (c) 2014 The FreeBSD Foundation.
*
* Portions of this software were developed by Konstantin Belousov
* under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice(s), this list of conditions and the following disclaimer as
* the first lines of this file unmodified other than the possible
* addition of one or more copyright notices.
* 2. Redistributions in binary form must reproduce the above copyright
* notice(s), this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/types.h>
#include <stddef.h>
#include "libc_private.h"
#define SLOT(a, b) \
[INTERPOS_##a] = (interpos_func_t)b
interpos_func_t __libc_interposing[INTERPOS_MAX] = {
SLOT(system, __libc_system),
SLOT(tcdrain, __libc_tcdrain),
SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
SLOT(spinlock, __libc_spinlock_stub),
SLOT(spinunlock, __libc_spinunlock_stub),
SLOT(map_stacks_exec, __libc_map_stacks_exec),
SLOT(distribute_static_tls, __libc_distribute_static_tls),
};
#undef SLOT
interpos_func_t *
__libc_interposing_slot(int interposno)
{
/* XXX: forward compat. Remove after 15.0-RELEASE. */
if (__libc_interposing[interposno] == NULL)
return (__libsys_interposing_slot(interposno));
return (&__libc_interposing[interposno]);
}

1
lib/libc/sys/Symbol.map
View file

@ -1049,7 +1049,6 @@ FBSDprivate_1.0 {
__sys_writev;
/* Things that aren't system calls (in sort(1) order) */
__libc_interposing_slot;
__libc_sigwait;
__libsys_interposing_slot;
__set_error_selector;

20
lib/libc/sys/interposing_table.c
View file

@ -30,21 +30,10 @@
*/
#include <sys/types.h>
#include <stddef.h>
#include "libc_private.h"
#define SLOT(a, b) \
[INTERPOS_##a] = (interpos_func_t)b
interpos_func_t __libc_interposing[INTERPOS_MAX] = {
SLOT(system, __libc_system),
SLOT(tcdrain, __libc_tcdrain),
SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
SLOT(spinlock, __libc_spinlock_stub),
SLOT(spinunlock, __libc_spinunlock_stub),
SLOT(map_stacks_exec, __libc_map_stacks_exec),
SLOT(distribute_static_tls, __libc_distribute_static_tls),
};
interpos_func_t __libsys_interposing[INTERPOS_MAX] = {
SLOT(accept, __sys_accept),
SLOT(accept4, __sys_accept4),
@ -86,15 +75,6 @@ interpos_func_t __libsys_interposing[INTERPOS_MAX] = {
};
#undef SLOT
interpos_func_t *
__libc_interposing_slot(int interposno)
{
/* XXX: forward compat. Remove after 15.0-RELEASE. */
if (__libc_interposing[interposno] == NULL)
return (__libsys_interposing_slot(interposno));
return (&__libc_interposing[interposno]);
}
interpos_func_t *
__libsys_interposing_slot(int interposno)
{