mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 13:50:06 +00:00
2255621f0e
The dl_main sets the LM_ID_BASE to RT_ADD just before starting to
add load new shared objects. The state is set to RT_CONSISTENT just
after all objects are loaded.
However if a audit modules tries to dlmopen an inexistent module,
the _dl_open will assert that the namespace is in an inconsistent
state.
This is different than dlopen, since first it will not use
LM_ID_BASE and second _dl_map_object_from_fd is the sole responsible
to set and reset the r_state value.
So the assert on _dl_open can not really be seen if the state is
consistent, since _dt_main resets it. This patch removes the assert.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit 484e672dda)
Resolved conflicts:
elf/Makefile
elf/dl-open.c
58 lines
1.3 KiB
C
58 lines
1.3 KiB
C
/* Check dlopen failure on audit modules.
|
|
Copyright (C) 2021 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 <dlfcn.h>
|
|
#include <link.h>
|
|
#include <stdlib.h>
|
|
|
|
unsigned int
|
|
la_version (unsigned int v)
|
|
{
|
|
return LAV_CURRENT;
|
|
}
|
|
|
|
static void
|
|
check (void)
|
|
{
|
|
{
|
|
void *mod = dlopen ("nonexistent.so", RTLD_NOW);
|
|
if (mod != NULL)
|
|
abort ();
|
|
}
|
|
|
|
{
|
|
void *mod = dlmopen (LM_ID_BASE, "nonexistent.so", RTLD_NOW);
|
|
if (mod != NULL)
|
|
abort ();
|
|
}
|
|
}
|
|
|
|
void
|
|
la_activity (uintptr_t *cookie, unsigned int flag)
|
|
{
|
|
if (flag != LA_ACT_CONSISTENT)
|
|
return;
|
|
check ();
|
|
}
|
|
|
|
void
|
|
la_preinit (uintptr_t *cookie)
|
|
{
|
|
check ();
|
|
}
|