From nobody Thu May 16 06:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1600698427; cv=none; d=zohomail.com; s=zohoarc; b=F51QPjExrXOhm+IDiv114ahyOlBBEMFkp9AatSPuIWe4YUe9HkGRVnAGZEg4Wj2sna+3WAY4uueudOe731pE11AyHmAKLxUP59cgdS9ZuBG10OGedXSBWTU5GjMnMF4p1j6p3p+++8rJ615N7PqTmn5xnPhzOmTIPBdaIaFZFBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600698427; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=FvbRk/8RINymNDhtwdW57mJY6Rhmg7Rn2NTOL6y4uMI=; b=N0wsCA+MpuNeDtvA8HLsQ29EyqlqiBJ3chCSYSaaMcrtatQfwTy/wsihQ8yA/Uj/+PkAiGTm82xmfmTqRzuCOBYx07L0E/hVFMFuXeLnQw9/9A+1yweddPhFlb8LFA8mSTbh07kKbahtIni0ioo4YrA8R9TNwzFVGT+gzFFLfUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600698427392750.6717228643419; Mon, 21 Sep 2020 07:27:07 -0700 (PDT) Received: from localhost ([::1]:52668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKMmX-0007ts-O6 for importer@patchew.org; Mon, 21 Sep 2020 10:27:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKMki-0006dF-03 for qemu-devel@nongnu.org; Mon, 21 Sep 2020 10:25:12 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:57834) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKMkY-0002mJ-Q5 for qemu-devel@nongnu.org; Mon, 21 Sep 2020 10:25:10 -0400 Received: from localhost.localdomain (unknown [183.159.201.198]) by smtp5 (Coremail) with SMTP id HdxpCgAXYwunt2hfnbm_Mw--.132S4; Mon, 21 Sep 2020 22:24:42 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=FvbRk/8RINymNDhtwd W57mJY6Rhmg7Rn2NTOL6y4uMI=; b=c1nWKBcZtkxiaplIBE7gjJpQHNj0zLKcKT HnB5zpV1Nzinnj5S4Q+ZDJ8GaudP72FYkK1HYnzph8gwCWhf11e8aE+1xJinUT6e lMdcTu33buT9npLiz9qiTEOR9bnl4G1PwDjsoWawb80WAaV9w19X9XDhoKVwXVN8 KtdyKPfDA= From: Li Qiang To: mst@redhat.com, pankaj.gupta.linux@gmail.com Subject: [PATCH REPOST] hw: virtio-pmem: detach the element fromt the virtqueue when error occurs Date: Mon, 21 Sep 2020 07:24:37 -0700 Message-Id: <20200921142437.5658-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: HdxpCgAXYwunt2hfnbm_Mw--.132S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrKr4rZry5Cw1UXw4DKFW7urg_yoWfArX_Gr WxCa4xWw4jgFyakrWUAr1rXF1fGa1UXFn0yr15tF18Ar18Jw45JF97XFsY9F17WrW0ga1U ArZ5Krs8Xw1fujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjhvKUUUUUU== X-Originating-IP: [183.159.201.198] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBZgqmbVaD5+t9LgAAst 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=123.126.97.5; envelope-from=liq3ea@163.com; helo=mail-m975.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/21 10:24:43 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Cc: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If error occurs while processing the virtio request we should call 'virtqueue_detach_element' to detach the element from the virtqueue before free the elem. Fixes: 5f503cd9f3 ("virtio-pmem: add virtio device") Reviewed-by: Pankaj Gupta Signed-off-by: Li Qiang --- hw/virtio/virtio-pmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index 1e0c137497..ddb0125901 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -77,6 +77,7 @@ static void virtio_pmem_flush(VirtIODevice *vdev, VirtQue= ue *vq) =20 if (req_data->elem.out_num < 1 || req_data->elem.in_num < 1) { virtio_error(vdev, "virtio-pmem request not proper"); + virtqueue_detach_element(vq, (VirtQueueElement *)req_data, 0); g_free(req_data); return; } --=20 2.17.1