Previously, the ELF linker would always just store the pointer to a

filename passed in via the module loader functions in the GDB
"sharedlibrary" support structures.  This isn't good, since the pointer
would become stale in almost every case (not the pre-loaded case, of
course).

Change this to malloc()ed copy of the string and finally fix the reason
that gdb -k's "sharedlibrary" command stopped working.

Obtained from:	LOMAC/FreeBSD (cf. NAI Labs)

1 files changed, 5 insertions, 1 deletions

diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index faaf160..785d23a 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -530,6 +530,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
     int symstrindex;
     int symcnt;
     int strcnt;
+    char *newfilename;
 
     GIANT_REQUIRED;
 
@@ -788,7 +789,9 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
 #ifdef DDB
     GDB_STATE(RT_ADD);
     ef->gdb.l_addr = lf->address;
-    ef->gdb.l_name = filename;
+    newfilename = malloc(strlen(filename) + 1, M_LINKER, M_WAITOK);
+    strcpy(newfilename, filename);
+    ef->gdb.l_name = (const char *)newfilename;
     ef->gdb.l_ld = ef->dynamic;
     link_elf_add_gdb(&ef->gdb);
     GDB_STATE(RT_CONSISTENT);
@@ -819,6 +822,7 @@ link_elf_unload_file(linker_file_t file)
 #ifdef DDB
     if (ef->gdb.l_ld) {
 	GDB_STATE(RT_DELETE);
+	free((void *)ef->gdb.l_name, M_LINKER);
 	link_elf_delete_gdb(&ef->gdb);
 	GDB_STATE(RT_CONSISTENT);
     }