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

Check return of cam_periph_find() before using it in a printf.

Browse Source 
If cam_periph_find() doesn't locate the path we requested, bail to error
condition.

Acquire ciss->mtx for this operation.

Reviewed by:	"Benesh, Scott" <scott.benesh@hp.com>
MFC after:	2 weeks
This commit is contained in:
Sean Bruno 2014-06-29 18:38:44 +00:00
parent 0135aadfc3
commit 97ed09b5ff
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ciss/ciss.c
View File

@ -3429,13 +3429,17 @@ ciss_name_device(struct ciss_softc *sc, int bus, int target)
target, 0);
if (status == CAM_REQ_CMP) {
mtx_lock(&sc->ciss_mtx);
xpt_path_lock(path);
periph = cam_periph_find(path, NULL);
sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
periph->periph_name, periph->unit_number);
xpt_path_unlock(path);
mtx_unlock(&sc->ciss_mtx);
xpt_free_path(path);
return(0);
if (periph != NULL) {
sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
periph->periph_name, periph->unit_number);
return(0);
}
}
sc->ciss_logical[bus][target].cl_name[0] = 0;
return(ENOENT);