diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 16:17:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 16:17:36 +0000 |
| commit | 61898bc020c3367c629a99a2abdaa1c60fce76cd (patch) | |
| tree | 11d3deb3441871402760f56a2e25edb5d1bbfca1 /hw | |
| parent | 0a87466ef3fe3d9a062195f801727569ab886bde (diff) | |
| parent | ec8929a55512606456e364ffa80586219f67c904 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
spapr_vscsi: remove duplicate condition check
scsi: check req pointer before dereferencing it
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/spapr_vscsi.c | 2 | ||||
| -rw-r--r-- | hw/scsi/vmw_pvscsi.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 34478f0157..d4ada4f335 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -690,7 +690,7 @@ static void vscsi_inquiry_no_target(VSCSIState *s, vscsi_req *req) int rc, len, alen; /* We dont do EVPD. Also check that page_code is 0 */ - if ((cdb[1] & 0x01) || (cdb[1] & 0x01) || cdb[2] != 0) { + if ((cdb[1] & 0x01) || cdb[2] != 0) { /* Send INVALID FIELD IN CDB */ vscsi_makeup_sense(s, req, ILLEGAL_REQUEST, 0x24, 0); vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0); diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 7d344b944e..e35bff76a9 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -479,12 +479,13 @@ static void pvscsi_command_complete(SCSIRequest *req, uint32_t status, size_t resid) { PVSCSIRequest *pvscsi_req = req->hba_private; - PVSCSIState *s = pvscsi_req->dev; + PVSCSIState *s; if (!pvscsi_req) { trace_pvscsi_command_complete_not_found(req->tag); return; } + s = pvscsi_req->dev; if (resid) { /* Short transfer. */ |