From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTceD-0003zi-F8 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTceA-0003vd-U2 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:25 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:37089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTceA-0003uL-Gu for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:22 -0400 Received: by mail-pz0-f45.google.com with SMTP id 30so2120606pzk.4 for ; Mon, 06 Jun 2011 09:27:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 6 Jun 2011 18:26:54 +0200 Message-Id: <1307377620-7538-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> References: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 3/9] pvscsi: check validity of DMA addresses in advance List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This also depends on the cpu_physical_memory_map_fast series, so I'm keeping it separated. Signed-off-by: Paolo Bonzini --- hw/vmw_pvscsi.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/vmw_pvscsi.c b/hw/vmw_pvscsi.c index 6f0b0b9..84bcfe6 100644 --- a/hw/vmw_pvscsi.c +++ b/hw/vmw_pvscsi.c @@ -383,6 +383,35 @@ static void pvscsi_transfer_data_with_sg_list(PVSCSIRequest *p, bool to_host, } } +static bool pvscsi_check_sg_list_addresses(PVSCSIRequest *p) +{ + uint64_t len = p->req.dataLen; + uint64_t n; + PVSCSISGState sg = { .elemAddr = p->req.dataAddr }; + while (len) { + while (!sg.resid) { + pvscsi_get_next_sg_elem(&sg); + } + n = MIN(len, sg.resid); + if (!cpu_physical_memory_map_check(sg.dataAddr, n)) { + return false; + } + + len -= n; + sg.resid -= n; + } + return true; +} + +static bool pvscsi_check_addresses(PVSCSIRequest *p) +{ + if (p->req.flags & PVSCSI_FLAG_CMD_WITH_SG_LIST) { + return pvscsi_check_sg_list_addresses(p); + } else { + return cpu_physical_memory_map_check(p->req.dataAddr, p->req.dataLen); + } +} + /* Callback to indicate that the SCSI layer has completed a transfer. */ static void pvscsi_transfer_data(SCSIRequest *req, uint32_t len) { @@ -487,6 +516,12 @@ static void pvscsi_process_req(PVSCSIState *s, struct PVSCSIRingReqDesc *r) return; } + if (!pvscsi_check_addresses(p)) { + p->cmp.hostStatus = BTSTAT_DATARUN; + pvscsi_complete_req(s, p); + return; + } + if (r->flags & PVSCSI_FLAG_CMD_WITH_SG_LIST) { p->sg.elemAddr = r->dataAddr; } -- 1.7.4.4