From nobody Wed Nov 5 17:43:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496751731328954.1737987773502; Tue, 6 Jun 2017 05:22:11 -0700 (PDT) Received: from localhost ([::1]:38154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIDUu-0005Jq-VV for importer@patchew.org; Tue, 06 Jun 2017 08:22:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIDQu-0001tT-Sp for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIDQt-0005Gz-R8 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:18:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIDQt-0005Gs-IC for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:17:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93EB8C0587D3; Tue, 6 Jun 2017 12:17:58 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-248.ams2.redhat.com [10.36.117.248]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v56CHmMC003973; Tue, 6 Jun 2017 08:17:57 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 93EB8C0587D3 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 93EB8C0587D3 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 14:17:44 +0200 Message-Id: <20170606121747.25356-5-pbonzini@redhat.com> In-Reply-To: <20170606121747.25356-1-pbonzini@redhat.com> References: <20170606121747.25356-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 06 Jun 2017 12:17:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/7] megasas: do not read DCMD opcode more than once from frame X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zyy4013@stu.ouc.edu.cn, hare@suse.de, ppandit@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Avoid TOC-TOU bugs by storing the DCMD opcode in the MegasasCmd Signed-off-by: Paolo Bonzini --- hw/scsi/megasas.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index c353118882..a3f75c1650 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -63,6 +63,7 @@ typedef struct MegasasCmd { =20 hwaddr pa; hwaddr pa_size; + uint32_t dcmd_opcode; union mfi_frame *frame; SCSIRequest *req; QEMUSGList qsg; @@ -513,6 +514,7 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *= s, cmd->context &=3D (uint64_t)0xFFFFFFFF; } cmd->count =3D count; + cmd->dcmd_opcode =3D -1; s->busy++; =20 if (s->consumer_pa) { @@ -1562,22 +1564,21 @@ static const struct dcmd_cmd_tbl_t { =20 static int megasas_handle_dcmd(MegasasState *s, MegasasCmd *cmd) { - int opcode; int retval =3D 0; size_t len; const struct dcmd_cmd_tbl_t *cmdptr =3D dcmd_cmd_tbl; =20 - opcode =3D le32_to_cpu(cmd->frame->dcmd.opcode); - trace_megasas_handle_dcmd(cmd->index, opcode); + cmd->dcmd_opcode =3D le32_to_cpu(cmd->frame->dcmd.opcode); + trace_megasas_handle_dcmd(cmd->index, cmd->dcmd_opcode); if (megasas_map_dcmd(s, cmd) < 0) { return MFI_STAT_MEMORY_NOT_AVAILABLE; } - while (cmdptr->opcode !=3D -1 && cmdptr->opcode !=3D opcode) { + while (cmdptr->opcode !=3D -1 && cmdptr->opcode !=3D cmd->dcmd_opcode)= { cmdptr++; } len =3D cmd->iov_size; if (cmdptr->opcode =3D=3D -1) { - trace_megasas_dcmd_unhandled(cmd->index, opcode, len); + trace_megasas_dcmd_unhandled(cmd->index, cmd->dcmd_opcode, len); retval =3D megasas_dcmd_dummy(s, cmd); } else { trace_megasas_dcmd_enter(cmd->index, cmdptr->desc, len); @@ -1592,13 +1593,11 @@ static int megasas_handle_dcmd(MegasasState *s, Meg= asasCmd *cmd) static int megasas_finish_internal_dcmd(MegasasCmd *cmd, SCSIRequest *req) { - int opcode; int retval =3D MFI_STAT_OK; int lun =3D req->lun; =20 - opcode =3D le32_to_cpu(cmd->frame->dcmd.opcode); - trace_megasas_dcmd_internal_finish(cmd->index, opcode, lun); - switch (opcode) { + trace_megasas_dcmd_internal_finish(cmd->index, cmd->dcmd_opcode, lun); + switch (cmd->dcmd_opcode) { case MFI_DCMD_PD_GET_INFO: retval =3D megasas_pd_get_info_submit(req->dev, lun, cmd); break; @@ -1606,7 +1605,7 @@ static int megasas_finish_internal_dcmd(MegasasCmd *c= md, retval =3D megasas_ld_get_info_submit(req->dev, lun, cmd); break; default: - trace_megasas_dcmd_internal_invalid(cmd->index, opcode); + trace_megasas_dcmd_internal_invalid(cmd->index, cmd->dcmd_opcode); retval =3D MFI_STAT_INVALID_DCMD; break; } @@ -1827,7 +1826,6 @@ static void megasas_xfer_complete(SCSIRequest *req, u= int32_t len) { MegasasCmd *cmd =3D req->hba_private; uint8_t *buf; - uint32_t opcode; =20 trace_megasas_io_complete(cmd->index, len); =20 @@ -1837,8 +1835,7 @@ static void megasas_xfer_complete(SCSIRequest *req, u= int32_t len) } =20 buf =3D scsi_req_get_buf(req); - opcode =3D le32_to_cpu(cmd->frame->dcmd.opcode); - if (opcode =3D=3D MFI_DCMD_PD_GET_INFO && cmd->iov_buf) { + if (cmd->dcmd_opcode =3D=3D MFI_DCMD_PD_GET_INFO && cmd->iov_buf) { struct mfi_pd_info *info =3D cmd->iov_buf; =20 if (info->inquiry_data[0] =3D=3D 0x7f) { @@ -1849,7 +1846,7 @@ static void megasas_xfer_complete(SCSIRequest *req, u= int32_t len) memcpy(info->vpd_page83, buf, len); } scsi_req_continue(req); - } else if (opcode =3D=3D MFI_DCMD_LD_GET_INFO) { + } else if (cmd->dcmd_opcode =3D=3D MFI_DCMD_LD_GET_INFO) { struct mfi_ld_info *info =3D cmd->iov_buf; =20 if (cmd->iov_buf) { --=20 2.13.0