libc,shared: detect newer library symbols at runtime
For libc syscall wrappers (pidfd_open, fsopen, openat2, etc.) we previously gated the calls behind build-time HAVE_* checks. Replace these with shim functions in src/libc/ that fall back to the raw syscall at runtime when the loaded glibc lacks the symbol. The infrastructure lives in src/libc/libc-shim.h: DEFINE_SYSCALL_SHIM falls back to a direct syscall, DEFINE_LIBC_SHIM returns ENOSYS (for posix_spawn-family helpers that have no corresponding syscall), and DEFINE_LIBC_ERRNO_SHIM sets errno=ENOSYS and returns -1 (for read/write-style helpers). The weak reference to the libc symbol is bound via __asm__(\"name\") rename so the bare libc identifier never appears as a C token — this avoids both #undef boilerplate against override-header redirects and the resulting -Wredundant-decls warning. Drop the corresponding cc.has_function() loop from meson.build. For optional libraries (libcryptsetup, libdw, libarchive), drop the per-symbol HAVE_* checks. Always declare the prototypes, suppressing the redundant-decl warnings via DISABLE_WARNING_REDUNDANT_DECLS and NOLINT, and resolve the symbols after the main dlopen via a new DLSYM_OPTIONAL() helper that only assigns on success. libcryptsetup's crypt_set_keyring_to_link / crypt_token_set_external_path and libarchive's *_is_set wrappers use fallback functions as their pointer initializers (returning -ENOSYS and 0 respectively), so call sites can invoke the symbol unconditionally and just check for -ENOSYS where the \"not supported\" distinction matters. The same shim treatment applies to pidfd_spawn / posix_spawnattr_setcgroup_np (src/libc/spawn.c) and epoll_pwait2 (src/libc/epoll.c), with corresponding override headers in src/include/override/spawn.h and src/include/override/sys/epoll.h. posix_spawn_wrapper() in process-util.c and epoll_wait_usec() in sd-event.c now detect ENOSYS in the return value instead of checking the function pointer, falling back to plain posix_spawn() and epoll_wait() respectively. coredump-config and coredump-submit get a dlopen_dw_has_dwfl_set_sysroot() helper. The kexec arch gate now uses defined(__NR_kexec_file_load) directly; pidfd.h uses __has_include_next() to decide whether to pull in glibc's header. This lets binaries built against newer glibc / libcryptsetup / libdw / libarchive headers still load and run on older targets where these symbols are absent.
This commit is contained in:
+25
-12
@@ -56,9 +56,12 @@ static DLSYM_PROTOTYPE(dwfl_begin) = NULL;
|
||||
static DLSYM_PROTOTYPE(dwfl_build_id_find_elf) = NULL;
|
||||
static DLSYM_PROTOTYPE(dwfl_core_file_attach) = NULL;
|
||||
static DLSYM_PROTOTYPE(dwfl_core_file_report) = NULL;
|
||||
#if HAVE_DWFL_SET_SYSROOT
|
||||
/* New in elfutils 0.192. Always redeclare so DLSYM_PROTOTYPE's typeof() resolves on older headers; suppress
|
||||
* the warning when newer libdw already declared it. */
|
||||
DISABLE_WARNING_REDUNDANT_DECLS;
|
||||
extern int dwfl_set_sysroot(Dwfl *dwfl, const char *sysroot); /* NOLINT(readability-redundant-declaration) */
|
||||
REENABLE_WARNING;
|
||||
static DLSYM_PROTOTYPE(dwfl_set_sysroot) = NULL;
|
||||
#endif
|
||||
static DLSYM_PROTOTYPE(dwfl_end) = NULL;
|
||||
static DLSYM_PROTOTYPE(dwfl_errmsg) = NULL;
|
||||
static DLSYM_PROTOTYPE(dwfl_errno) = NULL;
|
||||
@@ -121,9 +124,6 @@ int dlopen_dw(int log_level) {
|
||||
DLSYM_ARG(dwfl_module_getelf),
|
||||
DLSYM_ARG(dwfl_begin),
|
||||
DLSYM_ARG(dwfl_core_file_report),
|
||||
#if HAVE_DWFL_SET_SYSROOT
|
||||
DLSYM_ARG(dwfl_set_sysroot),
|
||||
#endif
|
||||
DLSYM_ARG(dwfl_report_end),
|
||||
DLSYM_ARG(dwfl_getmodules),
|
||||
DLSYM_ARG(dwfl_core_file_attach),
|
||||
@@ -139,6 +139,9 @@ int dlopen_dw(int log_level) {
|
||||
if (r <= 0)
|
||||
return r;
|
||||
|
||||
/* Optional symbol: present in libdw 0.192+. NULL pointer is fine; call sites check at use. */
|
||||
DLSYM_OPTIONAL(dw_dl, dwfl_set_sysroot);
|
||||
|
||||
return 1;
|
||||
#else
|
||||
return log_full_errno(log_level, SYNTHETIC_ERRNO(EOPNOTSUPP),
|
||||
@@ -146,6 +149,16 @@ int dlopen_dw(int log_level) {
|
||||
#endif
|
||||
}
|
||||
|
||||
bool dlopen_dw_has_dwfl_set_sysroot(void) {
|
||||
#if HAVE_ELFUTILS
|
||||
if (dlopen_dw(LOG_DEBUG) < 0)
|
||||
return false;
|
||||
return sym_dwfl_set_sysroot;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
int dlopen_elf(int log_level) {
|
||||
#if HAVE_ELFUTILS
|
||||
int r;
|
||||
@@ -660,13 +673,13 @@ static int parse_core(
|
||||
|
||||
if (empty_or_root(root))
|
||||
root = NULL;
|
||||
#if HAVE_DWFL_SET_SYSROOT
|
||||
if (root && sym_dwfl_set_sysroot(c.dwfl, root) < 0)
|
||||
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL), "Could not set root directory, dwfl_set_sysroot() failed: %s", sym_dwfl_errmsg(sym_dwfl_errno()));
|
||||
#else
|
||||
if (root)
|
||||
log_warning("Compiled without dwfl_set_sysroot() support, ignoring provided root directory.");
|
||||
#endif
|
||||
if (root) {
|
||||
if (sym_dwfl_set_sysroot) {
|
||||
if (sym_dwfl_set_sysroot(c.dwfl, root) < 0)
|
||||
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL), "Could not set root directory, dwfl_set_sysroot() failed: %s", sym_dwfl_errmsg(sym_dwfl_errno()));
|
||||
} else
|
||||
log_warning("Loaded libdw does not support dwfl_set_sysroot(), ignoring provided root directory.");
|
||||
}
|
||||
|
||||
if (sym_dwfl_core_file_report(c.dwfl, c.elf, executable) < 0)
|
||||
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL), "Could not parse core file, dwfl_core_file_report() failed: %s", sym_dwfl_errmsg(sym_dwfl_errno()));
|
||||
|
||||
Reference in New Issue
Block a user