From nobody Wed Nov 19 14:12:56 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=1616022492; cv=none; d=zohomail.com; s=zohoarc; b=h474EpHdvmaXU8k6anNstXFAQf9Wrb8o7QglhGKo8/acGbWKaybZ+rUNyhFRn0cZzXB3XUGAz8iJHoCpV608YbJ/Nmn596mYNZ+yYinZqmb34O2dU5B8A/fR/W1+806J6H8j97xFEdC56+tTuS8zsN0iwPs07QXLIyZw0kBC2QY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616022492; 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=rrvJDgOJPcAT8LGGx2vq7cbNdJ5fXTZoV+bUFKgTdrY=; b=itK/TUQWdjByBy6f2iyv9iiErEY4Wq/4zdlM/IWD39nf0MAqHBWJ4HHOf785Kbrx7lV99uA+fiREJDouQL5WR6EtYxSwUPvA1R9a7pafgKxvX+SIznmggDCycTjSPPwZCsAONT/RPxIfTNYwXjy0d8U8/jyOADju8Q6ST+slJJI= 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 1616022492558212.27889491375015; Wed, 17 Mar 2021 16:08:12 -0700 (PDT) Received: from localhost ([::1]:52852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMfGt-0007Dk-Ir for importer@patchew.org; Wed, 17 Mar 2021 19:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMfBq-0002iT-U6 for qemu-devel@nongnu.org; Wed, 17 Mar 2021 19:02:58 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:35398 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 1lMfBn-0005RQ-UC for qemu-devel@nongnu.org; Wed, 17 Mar 2021 19:02:58 -0400 Received: from host86-148-103-84.range86-148.btcentralplus.com ([86.148.103.84] 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 1lMfBm-0006Bn-0a; Wed, 17 Mar 2021 23:03:00 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, alxndr@bu.edu, laurent@vivier.eu, pbonzini@redhat.com Date: Wed, 17 Mar 2021 23:02:21 +0000 Message-Id: <20210317230223.24854-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210317230223.24854-1-mark.cave-ayland@ilande.co.uk> References: <20210317230223.24854-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.103.84 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 4/6] esp: don't underflow fifo when writing to the device 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" When writing to the device make sure that the fifo is not empty, otherwise = the fifo will underflow triggering an assert. Buglink: https://bugs.launchpad.net/qemu/+bug/1909247 Signed-off-by: Mark Cave-Ayland Tested-by: Alexander Bulekov --- hw/scsi/esp.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ae362c9dfb..bb57125035 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -509,18 +509,20 @@ static void do_dma_pdma_cb(ESPState *s) /* Copy FIFO data to device */ len =3D MIN(s->async_len, ESP_FIFO_SZ); len =3D MIN(len, fifo8_num_used(&s->fifo)); - memcpy(s->async_buf, fifo8_pop_buf(&s->fifo, len, &n), len); - s->async_buf +=3D n; - s->async_len -=3D n; - s->ti_size +=3D n; - - if (n < len) { - /* Unaligned accesses can cause FIFO wraparound */ - len =3D len - n; + if (len) { memcpy(s->async_buf, fifo8_pop_buf(&s->fifo, len, &n), len); s->async_buf +=3D n; s->async_len -=3D n; s->ti_size +=3D n; + + if (n < len) { + /* Unaligned accesses can cause FIFO wraparound */ + len =3D len - n; + memcpy(s->async_buf, fifo8_pop_buf(&s->fifo, len, &n), len= ); + s->async_buf +=3D n; + s->async_len -=3D n; + s->ti_size +=3D n; + } } =20 if (s->async_len =3D=3D 0) { @@ -730,10 +732,12 @@ static void esp_do_nodma(ESPState *s) =20 if (to_device) { len =3D MIN(fifo8_num_used(&s->fifo), ESP_FIFO_SZ); - memcpy(s->async_buf, fifo8_pop_buf(&s->fifo, len, &n), len); - s->async_buf +=3D len; - s->async_len -=3D len; - s->ti_size +=3D len; + if (len) { + memcpy(s->async_buf, fifo8_pop_buf(&s->fifo, len, &n), len); + s->async_buf +=3D len; + s->async_len -=3D len; + s->ti_size +=3D len; + } } else { len =3D MIN(s->ti_size, s->async_len); len =3D MIN(len, fifo8_num_free(&s->fifo)); --=20 2.20.1