From nobody Sun May 19 03:38:21 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=1597337270; cv=none; d=zohomail.com; s=zohoarc; b=V5Tw57hW7O4vyEyUH9BdIWLHPp1kSrdxLR/EHsqNN0Bq+Pi04Q8sb6KjuvKlrzqbmeD+aTPWZ4TGINu8X33MXwUvwb7BQ3k7pHOK3+1Ki4e8A4lHZQQ/QV6D7id62Q8ggh/OlxcSxlunlzIUxL+NaEwGzrqMkCDRjEFOxdCPBc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597337270; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=3RWw/EPFpusD4YS/BxBHEuBEnEA7bbd7X3AiOWv7oAA=; b=bSY1IbbsCzPDLeXOdTLIq6O90bb9FTfQEtJLKOz9diPHASRutd1lTzkFYvQaDDCiSRXs07YQbYuGUoqizDCUSCskigGdGKTB8UwgijSOJXcd+flfTnHBePTFuy8hD/FV6iJ7Qigat5fAb+/Oy8hy2aZf6jaONDnrUzkxfFAqjNI= 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 1597337270764832.5090686620156; Thu, 13 Aug 2020 09:47:50 -0700 (PDT) Received: from localhost ([::1]:55174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6GOL-0005Jr-4G for importer@patchew.org; Thu, 13 Aug 2020 12:47:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6GNW-0004rF-P9 for qemu-devel@nongnu.org; Thu, 13 Aug 2020 12:46:59 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:39560) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6GNQ-0003XB-Ts for qemu-devel@nongnu.org; Thu, 13 Aug 2020 12:46:57 -0400 Received: from localhost.localdomain (unknown [115.204.177.14]) by smtp1 (Coremail) with SMTP id GdxpCgDXghhzbjVfVCJ4Ag--.54S4; Fri, 14 Aug 2020 00:46:44 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=3RWw/EPFpusD4YS/Bx BHEuBEnEA7bbd7X3AiOWv7oAA=; b=H7F0IQtJjMiXPRWlKMAiH71fxO7iti6vHI lTHG2voWdGungVOHi2/RMtib+mCvFShTcmHuyVwOuW2fkeWUkKD0IqjsHzYv1qWR 8NDcZn24zfxA5TVJ/VGLNVh0ro54G8ubvQbiJSYmZPsytZfpec85fv9vDbz+y3lW e+HFKGN4g= From: Li Qiang To: mst@redhat.com, david@redhat.com Subject: [PATCH] hw: virtio-mem: detach the element fromt the virtqueue when error occurs Date: Thu, 13 Aug 2020 09:46:37 -0700 Message-Id: <20200813164637.58904-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: GdxpCgDXghhzbjVfVCJ4Ag--.54S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tF18XrykJFWxCry8XF47Arb_yoW8Wr43pr 48AFZ8Aa1xJFWIqF4ftF1UWry8Aws7tr12k3yxZw15GF1kAFn7JF1UZFyjqry7ArZ5ZF4x WFnYgr4aqas7uw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zRHv3nUUUUU= X-Originating-IP: [115.204.177.14] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBaxV-bVet1mnlsQAAs9 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.1; envelope-from=liq3ea@163.com; helo=mail-m971.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/13 11:36:23 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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, RCVD_IN_MSPIKE_H2=-1, 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. Signed-off-by: Li Qiang --- hw/virtio/virtio-mem.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7740fc613f..5ac6c3ec67 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -318,8 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vde= v, VirtQueue *vq) if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) { virtio_error(vdev, "virtio-mem protocol violation: invalid req= uest" " size: %d", len); - g_free(elem); - return; + goto out_free; } =20 if (iov_size(elem->in_sg, elem->in_num) < @@ -327,8 +326,7 @@ static void virtio_mem_handle_request(VirtIODevice *vde= v, VirtQueue *vq) virtio_error(vdev, "virtio-mem protocol violation: not enough = space" " for response: %zu", iov_size(elem->in_sg, elem->in_num)); - g_free(elem); - return; + goto out_free; } =20 type =3D le16_to_cpu(req.type); @@ -348,12 +346,15 @@ static void virtio_mem_handle_request(VirtIODevice *v= dev, VirtQueue *vq) default: virtio_error(vdev, "virtio-mem protocol violation: unknown req= uest" " type: %d", type); - g_free(elem); - return; + goto out_free; } =20 g_free(elem); } + +out_free: + virtqueue_detach_element(vq, elem, 0); + g_free(elem); } =20 static void virtio_mem_get_config(VirtIODevice *vdev, uint8_t *config_data) --=20 2.17.1