diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2012-10-10 18:34:15 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2012-10-10 18:34:15 +0000 |
| commit | 627995dcded68710c4a866916e9de85b0bc829ea (patch) | |
| tree | 5cc248f9710894255dd24dfe48153ef3362942de /sys/cam/cam_xpt.c | |
| parent | aa2a1aaf90a74e6fb81d71ae14c7e6c84049c203 (diff) | |
| download | src-627995dcded68710c4a866916e9de85b0bc829ea.tar.gz src-627995dcded68710c4a866916e9de85b0bc829ea.zip | |
Really handle xpt_compile_path() error in xpt_bus_register() instead of
print error message and probably crash just after it on NULL dereference.
Found by: Clang Static Analyzer
Notes
Notes:
svn path=/head/; revision=241405
Diffstat (limited to 'sys/cam/cam_xpt.c')
| -rw-r--r-- | sys/cam/cam_xpt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 4a174d76c93e..152782efe6ab 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3898,8 +3898,11 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus) status = xpt_compile_path(path, /*periph*/NULL, sim->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - if (status != CAM_REQ_CMP) - printf("xpt_compile_path returned %d\n", status); + if (status != CAM_REQ_CMP) { + xpt_release_bus(new_bus); + free(path, M_CAMXPT); + return (CAM_RESRC_UNAVAIL); + } xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL); cpi.ccb_h.func_code = XPT_PATH_INQ; |