Date: Sat, 31 Oct 2009 08:47:48 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 169980 for review Message-ID: <200910310847.n9V8lm6l033947@repoman.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/chv.cgi?CH=169980 Change 169980 by mav@mav_mavtest on 2009/10/31 08:47:33 Ensure target/lun passed from user-level supported on this bus. Scanning unsupported IDs causes different issues from duplicate devices to system crash. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#111 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#111 (text+ko) ==== @@ -453,7 +453,34 @@ ccb = xpt_alloc_ccb(); CAM_SIM_LOCK(bus->sim); - + /* Ensure passed in target/lun supported on this bus. */ + if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD) || + (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD)) { + if (xpt_create_path(&ccb->ccb_h.path, + xpt_periph, + inccb->ccb_h.path_id, + CAM_TARGET_WILDCARD, + CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + error = EINVAL; + CAM_SIM_UNLOCK(bus->sim); + xpt_free_ccb(ccb); + break; + } + xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, + inccb->ccb_h.pinfo.priority); + ccb->ccb_h.func_code = XPT_PATH_INQ; + xpt_action(ccb); + xpt_free_path(ccb->ccb_h.path); + if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD && + inccb->ccb_h.target_id > ccb->cpi.max_target) || + (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD && + inccb->ccb_h.target_lun > ccb->cpi.max_lun)) { + error = EINVAL; + CAM_SIM_UNLOCK(bus->sim); + xpt_free_ccb(ccb); + break; + } + } /* * Create a path using the bus, target, and lun the * user passed in.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910310847.n9V8lm6l033947>