mirror of
https://github.com/apache/nuttx.git
synced 2026-08-14 17:03:29 +00:00
dlopen() of a library that is already loaded fails. libelf_insert() rejects a name that is already in the module registry with EEXIST, and dlinsert() passes that straight out, so the second caller gets NULL. POSIX says dlopen() shall return a handle to the object, and there is no way today for two modules to hold the same library at once -- which is what a shared library is for. So dlopen() now takes another reference on a library that is already there, and dlclose() only tears it down when the last handle goes. The count lives in the dlfcn layer rather than in libelf_insert() so that insmod keeps its own behaviour: a second insmod of the same name still fails with EEXIST, which is right for a kernel module. The module name is what makes any of this possible, and a PROTECTED build did not have one. Names were defined for CONFIG_BUILD_FLAT or the kernel side of a split build, on the reasoning that only the kernel needed them, which predates dlopen() being usable from user space. Without a name the user-space copy of libelf cannot recognise a second open of a library, cannot count opens, and cannot make dlclose() mean anything -- two dlopen()s there produce two independent copies of the library and lose track of the first. Names are therefore defined wherever CONFIG_LIBC_DLFCN is, which costs NAME_MAX per loaded module in that configuration. The path no longer has to be copied either. The module name is the basename of the file and libelf_insert() takes it as a const string, so dlinsert() finds it with strrchr() instead of handing a writable duplicate of the whole path to basename(). BUILD_KERNEL is deliberately untouched. dlopen() returns NULL there unconditionally: dlinsert() is a stub, because sharing a library between processes with separate address spaces needs the text in a shared region and the data per process at a matching virtual address, which is a different problem from this one. Built for mps3-an547:picostest with and without CONFIG_LIBC_DLFCN, and for stm32f4discovery:kostest, a PROTECTED configuration, with it enabled. Assisted-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
249 lines
6.5 KiB
C
249 lines
6.5 KiB
C
/****************************************************************************
|
|
* libs/libc/elf/elf_remove.c
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
#include <assert.h>
|
|
#include <nuttx/debug.h>
|
|
#include <errno.h>
|
|
|
|
#include <nuttx/arch.h>
|
|
#include <nuttx/lib/lib.h>
|
|
#include <nuttx/lib/elf.h>
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: libelf_uninit
|
|
*
|
|
* Description:
|
|
* Uninitialize module resources.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int libelf_uninit(FAR struct module_s *modp)
|
|
{
|
|
FAR void (**array)(void);
|
|
int ret = OK;
|
|
int i;
|
|
|
|
#if CONFIG_LIBC_ELF_MAXDEPEND > 0
|
|
/* Refuse to remove any module that other modules may depend upon. */
|
|
|
|
if (modp->dependents > 0)
|
|
{
|
|
berr("ERROR: Module has dependents: %d\n", modp->dependents);
|
|
return -EBUSY;
|
|
}
|
|
#endif
|
|
|
|
/* Is there an uninitializer? */
|
|
|
|
array = (FAR void (**)(void))modp->finiarr;
|
|
for (i = 0; i < modp->nfini; i++)
|
|
{
|
|
array[i]();
|
|
}
|
|
|
|
if (modp->modinfo.uninitializer != NULL)
|
|
{
|
|
/* Try to uninitialize the module */
|
|
|
|
ret = modp->modinfo.uninitializer(modp->modinfo.arg);
|
|
|
|
/* Did the module successfully uninitialize? */
|
|
|
|
if (ret < 0)
|
|
{
|
|
berr("ERROR: Failed to uninitialize the module: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
libelf_freesymtab(modp);
|
|
|
|
/* Nullify so that the uninitializer cannot be called again */
|
|
|
|
modp->modinfo.uninitializer = NULL;
|
|
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
|
|
modp->modinfo.arg = NULL;
|
|
modp->modinfo.exports = NULL;
|
|
modp->modinfo.nexports = 0;
|
|
#endif
|
|
}
|
|
|
|
/* Release resources held by the module */
|
|
|
|
if (modp->textalloc != NULL || modp->dataalloc != NULL)
|
|
{
|
|
/* Free the module memory and nullify so that the memory cannot
|
|
* be freed again
|
|
*
|
|
* NOTE: For dynamic shared objects there is only a single
|
|
* allocation: the text/data were allocated in one operation
|
|
*/
|
|
|
|
if (!modp->dynamic)
|
|
{
|
|
#ifdef CONFIG_ARCH_USE_SEPARATED_SECTION
|
|
for (i = 0; i < modp->nsect && modp->sectalloc[i] != NULL; i++)
|
|
{
|
|
# ifdef CONFIG_ARCH_USE_TEXT_HEAP
|
|
if (up_textheap_heapmember(modp->sectalloc[i]))
|
|
{
|
|
up_textheap_free(modp->sectalloc[i]);
|
|
continue;
|
|
}
|
|
# endif
|
|
|
|
# ifdef CONFIG_ARCH_USE_DATA_HEAP
|
|
if (up_dataheap_heapmember(modp->sectalloc[i]))
|
|
{
|
|
up_dataheap_free(modp->sectalloc[i]);
|
|
continue;
|
|
}
|
|
# endif
|
|
|
|
lib_free(modp->sectalloc[i]);
|
|
}
|
|
|
|
lib_free(modp->sectalloc);
|
|
modp->sectalloc = NULL;
|
|
modp->nsect = 0;
|
|
#else
|
|
if (modp->xipbase == 0)
|
|
{
|
|
# if defined(CONFIG_ARCH_USE_TEXT_HEAP)
|
|
up_textheap_free((FAR void *)modp->textalloc);
|
|
# else
|
|
lib_free((FAR void *)modp->textalloc);
|
|
# endif
|
|
}
|
|
|
|
# if defined(CONFIG_ARCH_USE_DATA_HEAP)
|
|
up_dataheap_free((FAR void *)modp->dataalloc);
|
|
# else
|
|
lib_free((FAR void *)modp->dataalloc);
|
|
# endif
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
lib_free((FAR void *)modp->textalloc);
|
|
}
|
|
|
|
modp->textalloc = NULL;
|
|
modp->dataalloc = NULL;
|
|
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
|
|
modp->textsize = 0;
|
|
modp->datasize = 0;
|
|
#endif
|
|
}
|
|
|
|
#if CONFIG_LIBC_ELF_MAXDEPEND > 0
|
|
/* Eliminate any dependencies that this module has on other modules */
|
|
|
|
libelf_undepend(modp);
|
|
#endif
|
|
|
|
return ret;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: libelf_remove
|
|
*
|
|
* Description:
|
|
* Remove a previously installed module from memory.
|
|
*
|
|
* Input Parameters:
|
|
* handle - The module handler previously returned by libelf_insert().
|
|
*
|
|
* Returned Value:
|
|
* Zero (OK) on success. On any failure, -1 (ERROR) is returned the
|
|
* errno value is set appropriately.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int libelf_remove(FAR void *handle)
|
|
{
|
|
FAR struct module_s *modp = (FAR struct module_s *)handle;
|
|
int ret;
|
|
|
|
DEBUGASSERT(modp != NULL);
|
|
|
|
/* Get exclusive access to the module registry */
|
|
|
|
libelf_registry_lock();
|
|
|
|
/* Verify that the module is in the registry */
|
|
|
|
ret = libelf_registry_verify(modp);
|
|
if (ret < 0)
|
|
{
|
|
berr("ERROR: Failed to verify module: %d\n", ret);
|
|
goto errout_with_lock;
|
|
}
|
|
|
|
/* Give back a reference. The module goes only when the last one does,
|
|
* so an rmmod() cannot pull a module out from under a dlopen() that is
|
|
* still holding it.
|
|
*/
|
|
|
|
if (modp->nopen > 1)
|
|
{
|
|
modp->nopen--;
|
|
libelf_registry_unlock();
|
|
return OK;
|
|
}
|
|
|
|
modp->nopen = 0;
|
|
|
|
ret = libelf_uninit(modp);
|
|
if (ret < 0)
|
|
{
|
|
berr("ERROR: Failed to uninitialize module %d\n", ret);
|
|
goto errout_with_lock;
|
|
}
|
|
|
|
/* Remove the module from the registry */
|
|
|
|
ret = libelf_registry_del(modp);
|
|
if (ret < 0)
|
|
{
|
|
berr("ERROR: Failed to remove the module from the registry: %d\n",
|
|
ret);
|
|
goto errout_with_lock;
|
|
}
|
|
|
|
libelf_registry_unlock();
|
|
|
|
/* And free the registry entry */
|
|
|
|
return ret;
|
|
|
|
errout_with_lock:
|
|
libelf_registry_unlock();
|
|
set_errno(-ret);
|
|
return ERROR;
|
|
}
|