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

- Push down Giant in kldfind() and kldsym().

Browse Source 
- Remove several goto's by either using direct return's or else clauses.
This commit is contained in:
jhb 2006-06-21 20:15:36 +00:00
parent 210ed4b32d
commit acb5f7e773
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/kern/kern_linker.c
View File

@ -959,7 +959,6 @@ kldfind(struct thread *td, struct kldfind_args *uap)
return (error); return (error);
#endif #endif
mtx_lock(&Giant);
td->td_retval[0] = -1; td->td_retval[0] = -1;
pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
@ -967,14 +966,15 @@ kldfind(struct thread *td, struct kldfind_args *uap)
goto out; goto out;
filename = linker_basename(pathname); filename = linker_basename(pathname);
mtx_lock(&Giant);
lf = linker_find_file_by_name(filename); lf = linker_find_file_by_name(filename);
if (lf) if (lf)
td->td_retval[0] = lf->id; td->td_retval[0] = lf->id;
else else
error = ENOENT; error = ENOENT;
mtx_unlock(&Giant);
out: out:
free(pathname, M_TEMP); free(pathname, M_TEMP);
mtx_unlock(&Giant);
return (error); return (error);
} }
@ -1116,25 +1116,20 @@ kldsym(struct thread *td, struct kldsym_args *uap)
return (error); return (error);
#endif #endif
mtx_lock(&Giant);
if ((error = copyin(uap->data, &lookup, sizeof(lookup))) != 0) if ((error = copyin(uap->data, &lookup, sizeof(lookup))) != 0)
goto out; return (error);
if (lookup.version != sizeof(lookup) || if (lookup.version != sizeof(lookup) ||
uap->cmd != KLDSYM_LOOKUP) { uap->cmd != KLDSYM_LOOKUP)
error = EINVAL; return (EINVAL);
goto out;
}
symstr = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); symstr = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
if ((error = copyinstr(lookup.symname, symstr, MAXPATHLEN, NULL)) != 0) if ((error = copyinstr(lookup.symname, symstr, MAXPATHLEN, NULL)) != 0)
goto out; goto out;
mtx_lock(&Giant);
if (uap->fileid != 0) { if (uap->fileid != 0) {
lf = linker_find_file_by_id(uap->fileid); lf = linker_find_file_by_id(uap->fileid);
if (lf == NULL) { if (lf == NULL)
error = ENOENT; error = ENOENT;
goto out; else if (LINKER_LOOKUP_SYMBOL(lf, symstr, &sym) == 0 &&
}
if (LINKER_LOOKUP_SYMBOL(lf, symstr, &sym) == 0 &&
LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) { LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) {
lookup.symvalue = (uintptr_t) symval.value; lookup.symvalue = (uintptr_t) symval.value;
lookup.symsize = symval.size; lookup.symsize = symval.size;
@ -1157,10 +1152,9 @@ kldsym(struct thread *td, struct kldsym_args *uap)
if (lf == NULL) if (lf == NULL)
error = ENOENT; error = ENOENT;
} }
out:
if (symstr)
free(symstr, M_TEMP);
mtx_unlock(&Giant); mtx_unlock(&Giant);
out:
free(symstr, M_TEMP);
return (error); return (error);
} }