diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2018-07-19 19:50:42 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2018-07-19 19:50:42 +0000 |
| commit | 73624a804a52723d7377003bfee94af39e9fa1fe (patch) | |
| tree | 00a5e6a334a1b90bf69ca10dedf1f961eb00a82b /sys/kern | |
| parent | 7679e49dd436fb975c3c0e4815cdbcb52c024c7c (diff) | |
| download | src-73624a804a52723d7377003bfee94af39e9fa1fe.tar.gz src-73624a804a52723d7377003bfee94af39e9fa1fe.zip | |
Provide the full module path to preload_delete_name().
The basename will never match against the preload metadata, so these
calls previously had no effect.
Reviewed by: kib, royger
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D16330
Notes
Notes:
svn path=/head/; revision=336504
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/link_elf.c | 4 | ||||
| -rw-r--r-- | sys/kern/link_elf_obj.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index e9bd2119c1d9..667a0f09cd28 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1168,8 +1168,8 @@ link_elf_unload_file(linker_file_t file) static void link_elf_unload_preload(linker_file_t file) { - if (file->filename != NULL) - preload_delete_name(file->filename); + if (file->pathname != NULL) + preload_delete_name(file->pathname); } static const char * diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 0820be1f4b31..34fdad944519 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -1038,8 +1038,8 @@ link_elf_unload_file(linker_file_t file) free(ef->ctftab, M_LINKER); free(ef->ctfoff, M_LINKER); free(ef->typoff, M_LINKER); - if (file->filename != NULL) - preload_delete_name(file->filename); + if (file->pathname != NULL) + preload_delete_name(file->pathname); /* XXX reclaim module memory? */ return; } |