d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two more instances of using a linker_file_t object in TAILQ() macros

Browse Source 
after free'ing it.

Found by:	Coverity Prevent(tm)
CID:		1435
This commit is contained in:
jhb 2006-07-10 19:13:45 +00:00
parent 0baddf7a5b
commit 401a0eaea0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_linker.c
View File

@ -1274,7 +1274,7 @@ linker_preload(void *arg)
caddr_t modptr;
const char *modname, *nmodname;
char *modtype;
linker_file_t lf;
linker_file_t lf, nlf;
linker_class_t lc;
int error;
linker_file_list_t loaded_files;
@ -1384,10 +1384,10 @@ linker_preload(void *arg)
nver) != NULL) {
printf("module %s already"
" present!\n", modname);
linker_file_unload(lf,
LINKER_UNLOAD_FORCE);
TAILQ_REMOVE(&loaded_files,
lf, loaded);
linker_file_unload(lf,
LINKER_UNLOAD_FORCE);
/* we changed tailq next ptr */
goto restart;
}
@ -1418,7 +1418,7 @@ linker_preload(void *arg)
/*
* We made it. Finish off the linking in the order we determined.
*/
TAILQ_FOREACH(lf, &depended_files, loaded) {
TAILQ_FOREACH_SAFE(lf, &depended_files, loaded, nlf) {
if (linker_kernel_file) {
linker_kernel_file->refs++;
error = linker_file_add_dependency(lf,
@ -1453,6 +1453,7 @@ linker_preload(void *arg)
*/
error = LINKER_LINK_PRELOAD_FINISH(lf);
if (error) {
TAILQ_REMOVE(&depended_files, lf, loaded);
printf("KLD file %s - could not finalize loading\n",
lf->filename);
linker_file_unload(lf, LINKER_UNLOAD_FORCE);