From nobody Wed Nov 19 14:02:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615937688; cv=none; d=zohomail.com; s=zohoarc; b=DX+7z5m5hAWLsQFDjiZWKdTKKJJ2KZxaCBu/qCDIprMQy1ME2tKuSUzJ6yAYPuFuaFLUOwplBce9L0SxDM9g6gE8pBHKIuhuKo1E1guqPBXns43ZTGvL8y3WSR9YBDgidMUQtaMC1bCYbs9kvz75Ird/qP37oxrnzmoTKNNehEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615937688; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y0j0BLkio8Vvw+yjHqtE1l/kbz/AP8BsnhpX7IzOeyQ=; b=SrBtnYzeFrspU9IJ0dil0RpCFe41OFSnu7PFaE2Kdj9TSvJ6j6UcC6PvIKvxrJcv143r3GsITzbvrVho2LAKY1JD26D2AT3vb6wyIrAPI2DEZ34wuTBVIAx6TLM98ZDZHiOQ4xdSDqo2H6ytt6pt3dTo8oJ1ds2Ra3OcKzrcbIA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615937688100321.94531285265987; Tue, 16 Mar 2021 16:34:48 -0700 (PDT) Received: from localhost ([::1]:57058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMJD4-0006Fb-Vw for importer@patchew.org; Tue, 16 Mar 2021 19:34:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMJ9Z-0002Tp-JS for qemu-devel@nongnu.org; Tue, 16 Mar 2021 19:31:09 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:33376 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMJ9X-0007GH-Id for qemu-devel@nongnu.org; Tue, 16 Mar 2021 19:31:09 -0400 Received: from host109-156-104-46.range109-156.btcentralplus.com ([109.156.104.46] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lMJ9V-0006Mg-EF; Tue, 16 Mar 2021 23:31:10 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, alxndr@bu.edu Date: Tue, 16 Mar 2021 23:30:22 +0000 Message-Id: <20210316233024.13560-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210316233024.13560-1-mark.cave-ayland@ilande.co.uk> References: <20210316233024.13560-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 109.156.104.46 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/4] esp: don't overflow cmdfifo if TC is larger than the cmdfifo size X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If a guest transfers the message out/command phase data using DMA with a TC that is larger than the cmdfifo size then the cmdfifo overflows triggering an assert. Limit the size of the transfer to the free space available in cmdfifo. Buglink: https://bugs.launchpad.net/qemu/+bug/1919036 Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Alexander Bulekov --- hw/scsi/esp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5d3f1ccbc8..bbcbfa4a91 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -579,6 +579,7 @@ static void esp_do_dma(ESPState *s) cmdlen =3D fifo8_num_used(&s->cmdfifo); trace_esp_do_dma(cmdlen, len); if (s->dma_memory_read) { + len =3D MIN(len, fifo8_num_free(&s->cmdfifo)); s->dma_memory_read(s->dma_opaque, buf, len); fifo8_push_all(&s->cmdfifo, buf, len); } else { --=20 2.20.1