Date: Thu, 19 Jul 2018 19:50:42 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336504 - head/sys/kern Message-ID: <201807191950.w6JJogG3023948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Jul 19 19:50:42 2018 New Revision: 336504 URL: https://svnweb.freebsd.org/changeset/base/336504 Log: 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 Modified: head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c Modified: head/sys/kern/link_elf.c ============================================================================== --- head/sys/kern/link_elf.c Thu Jul 19 19:33:42 2018 (r336503) +++ head/sys/kern/link_elf.c Thu Jul 19 19:50:42 2018 (r336504) @@ -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 * Modified: head/sys/kern/link_elf_obj.c ============================================================================== --- head/sys/kern/link_elf_obj.c Thu Jul 19 19:33:42 2018 (r336503) +++ head/sys/kern/link_elf_obj.c Thu Jul 19 19:50:42 2018 (r336504) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807191950.w6JJogG3023948>