Add Target/LUN ID checks and deny access to targets 1-14 when PMP absent.
This commit is contained in:
parent
89f2835fc9
commit
81a75ae365
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=207431
@ -1610,6 +1610,23 @@ siis_sata_connect(struct siis_channel *ch)
|
||||
return (1);
|
||||
}
|
||||
|
||||
static int
|
||||
siis_check_ids(device_t dev, union ccb *ccb)
|
||||
{
|
||||
|
||||
if (ccb->ccb_h.target_id > 15) {
|
||||
ccb->ccb_h.status = CAM_TID_INVALID;
|
||||
xpt_done(ccb);
|
||||
return (-1);
|
||||
}
|
||||
if (ccb->ccb_h.target_lun != 0) {
|
||||
ccb->ccb_h.status = CAM_LUN_INVALID;
|
||||
xpt_done(ccb);
|
||||
return (-1);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
{
|
||||
@ -1626,9 +1643,12 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
/* Common cases first */
|
||||
case XPT_ATA_IO: /* Execute the requested I/O operation */
|
||||
case XPT_SCSI_IO:
|
||||
if (ch->devices == 0) {
|
||||
if (siis_check_ids(dev, ccb))
|
||||
return;
|
||||
if (ch->devices == 0 ||
|
||||
(ch->pm_present == 0 &&
|
||||
ccb->ccb_h.target_id > 0 && ccb->ccb_h.target_id < 15)) {
|
||||
ccb->ccb_h.status = CAM_SEL_TIMEOUT;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
/* Check for command collision. */
|
||||
@ -1640,7 +1660,7 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
return;
|
||||
}
|
||||
siis_begin_transaction(dev, ccb);
|
||||
break;
|
||||
return;
|
||||
case XPT_EN_LUN: /* Enable LUN as a target */
|
||||
case XPT_TARGET_IO: /* Execute target I/O request */
|
||||
case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
|
||||
@ -1648,13 +1668,14 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
case XPT_ABORT: /* Abort the specified CCB */
|
||||
/* XXX Implement */
|
||||
ccb->ccb_h.status = CAM_REQ_INVALID;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
case XPT_SET_TRAN_SETTINGS:
|
||||
{
|
||||
struct ccb_trans_settings *cts = &ccb->cts;
|
||||
struct siis_device *d;
|
||||
|
||||
if (siis_check_ids(dev, ccb))
|
||||
return;
|
||||
if (cts->type == CTS_TYPE_CURRENT_SETTINGS)
|
||||
d = &ch->curr[ccb->ccb_h.target_id];
|
||||
else
|
||||
@ -1677,7 +1698,6 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
if (cts->xport_specific.sata.valid & CTS_SATA_VALID_TAGS)
|
||||
d->atapi = cts->xport_specific.sata.atapi;
|
||||
ccb->ccb_h.status = CAM_REQ_CMP;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
case XPT_GET_TRAN_SETTINGS:
|
||||
@ -1687,6 +1707,8 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
struct siis_device *d;
|
||||
uint32_t status;
|
||||
|
||||
if (siis_check_ids(dev, ccb))
|
||||
return;
|
||||
if (cts->type == CTS_TYPE_CURRENT_SETTINGS)
|
||||
d = &ch->curr[ccb->ccb_h.target_id];
|
||||
else
|
||||
@ -1722,48 +1744,16 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
cts->xport_specific.sata.atapi = d->atapi;
|
||||
cts->xport_specific.sata.valid |= CTS_SATA_VALID_ATAPI;
|
||||
ccb->ccb_h.status = CAM_REQ_CMP;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
#if 0
|
||||
case XPT_CALC_GEOMETRY:
|
||||
{
|
||||
struct ccb_calc_geometry *ccg;
|
||||
uint32_t size_mb;
|
||||
uint32_t secs_per_cylinder;
|
||||
|
||||
ccg = &ccb->ccg;
|
||||
size_mb = ccg->volume_size
|
||||
/ ((1024L * 1024L) / ccg->block_size);
|
||||
if (size_mb >= 1024 && (aha->extended_trans != 0)) {
|
||||
if (size_mb >= 2048) {
|
||||
ccg->heads = 255;
|
||||
ccg->secs_per_track = 63;
|
||||
} else {
|
||||
ccg->heads = 128;
|
||||
ccg->secs_per_track = 32;
|
||||
}
|
||||
} else {
|
||||
ccg->heads = 64;
|
||||
ccg->secs_per_track = 32;
|
||||
}
|
||||
secs_per_cylinder = ccg->heads * ccg->secs_per_track;
|
||||
ccg->cylinders = ccg->volume_size / secs_per_cylinder;
|
||||
ccb->ccb_h.status = CAM_REQ_CMP;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
case XPT_RESET_BUS: /* Reset the specified SCSI bus */
|
||||
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
|
||||
siis_reset(dev);
|
||||
ccb->ccb_h.status = CAM_REQ_CMP;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
case XPT_TERM_IO: /* Terminate the I/O process */
|
||||
/* XXX Implement */
|
||||
ccb->ccb_h.status = CAM_REQ_INVALID;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
case XPT_PATH_INQ: /* Path routing inquiry */
|
||||
{
|
||||
@ -1790,14 +1780,13 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
|
||||
cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
|
||||
cpi->ccb_h.status = CAM_REQ_CMP;
|
||||
cpi->maxio = MAXPHYS;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ccb->ccb_h.status = CAM_REQ_INVALID;
|
||||
xpt_done(ccb);
|
||||
break;
|
||||
}
|
||||
xpt_done(ccb);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user