svn commit: r336749 - stable/11/sys/kern

[Mark Johnston]

Author: markj
Date: Thu Jul 26 19:00:30 2018
New Revision: 336749
URL: https://svnweb.freebsd.org/changeset/base/336749

Log:
  MFC r336504, r336507:
  Provide the full module path to preload_delete_name().

Modified:
  stable/11/sys/kern/link_elf.c
  stable/11/sys/kern/link_elf_obj.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/link_elf.c
==============================================================================
--- stable/11/sys/kern/link_elf.c	Thu Jul 26 18:57:51 2018	(r336748)
+++ stable/11/sys/kern/link_elf.c	Thu Jul 26 19:00:30 2018	(r336749)
@@ -1169,8 +1169,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: stable/11/sys/kern/link_elf_obj.c
==============================================================================
--- stable/11/sys/kern/link_elf_obj.c	Thu Jul 26 18:57:51 2018	(r336748)
+++ stable/11/sys/kern/link_elf_obj.c	Thu Jul 26 19:00:30 2018	(r336749)
@@ -1030,9 +1030,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);
-		/* XXX reclaim module memory? */
+		if (file->pathname != NULL)
+			preload_delete_name(file->pathname);
 		return;
 	}