From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584963156; cv=none; d=zohomail.com; s=zohoarc; b=Ixf+TKcRlFWFctl/0amOxaHFvT8Au8wa5ZWtZrGTlhmzdhALEBebDAchEFRnAsO0Czyq+SWHpOpGG53s9DVsOODnmKfuu6SAmTZgd7WZl8BKsO/hhlldUbri7ccntHJ7Ku9FebQ1UUDxywvsPDMfo5yasxZ3GZkIn8pRBA1A/C0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584963156; h=Content-Type:Content-Transfer-Encoding:Cc: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=CnY3zLI4QPJwJbV3E83s5quIe0UqJksgPfBVqujwwYQ=; b=bDXxrnLurh49lAnPdYvwOCqkIKaKxWIAFqjt9EE9UoOHhAhQiwilaDRBnxLgmOzl7sJx5LSaqSgNyQuQM7TGxr/AFE2RHHDCOpsvJc3Q0kzTViY8U8Fsm59MWesdUWsuXGS1PIo0WqmVrzcWez1e3H7kU08X1mCnJo+wwtJFOZs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 15849631559981008.201271659972; Mon, 23 Mar 2020 04:32:35 -0700 (PDT) Received: from localhost ([::1]:60488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLJq-0000eI-Ox for importer@patchew.org; Mon, 23 Mar 2020 07:32:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLHH-000633-SI for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGLHG-0005oP-Oj for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:29:55 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:27777) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGLHG-0005oA-Lj for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:29:54 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-4gLPi4zqOFieM-ye2pmKgg-1; Mon, 23 Mar 2020 07:29:52 -0400 Received: by mail-wm1-f70.google.com with SMTP id x23so557976wmj.1 for ; Mon, 23 Mar 2020 04:29:52 -0700 (PDT) Received: from localhost.localdomain (37.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.37]) by smtp.gmail.com with ESMTPSA id 9sm3933672wmm.6.2020.03.23.04.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 04:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584962994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CnY3zLI4QPJwJbV3E83s5quIe0UqJksgPfBVqujwwYQ=; b=JxMdLQKD3RurIf1ttp5UO1h2Pcgg2hjsT4AKC9pbkfeUVkZfXnO3JFUy1OzCy2APDBG0Nt WIZmM+/vChjNCwjyjf7qpbO5Rz2Y1eDfuvpiRHmp46qO6KNreIfA8tAtr7aWSuk+N21OQx rZZWuK2D8mXuCGgWIJkvMyUTmFKNv8M= X-MC-Unique: 4gLPi4zqOFieM-ye2pmKgg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7K6WQY9fcdbigH9iiFUH1LhMVHv2gz9dk5QjDw4BfrU=; b=pIkvnTEgNEfts8lM45Xyy0j1AkSSu02OoAZ/3k0LaV0MixNvrIxXAsZnehEXesURFK kRVwSxkMTaGMHFP3is10IqNwsK/oTNFq9t3PbNBgc1xIko21Cs/i3tH57BDKcohq3wX/ aMlcV7BeAlhR2/vXbgQLMGadZTLiCNE3IGddDML8sTbXFDHG4niJ+w/Bq1OM1Ps/4yx/ Wsx7GVngWx8fUmWhtFiV/Z0ogjtEkPW4fBSK3VqJ8co0FOYI0Jc3R53h7UgIq6af7M2u cUY87YnPEBXwITSPfogfbXt3jkH/3HUOFDud8JJIfK6cT+KXB+ZzJhhi3DfhGreRsEpM CO6Q== X-Gm-Message-State: ANhLgQ2d7F42aAp8dFpxu9YKq70KyM7+ez02F971Ta9E2OIPYBOi2cRZ OhKgVUXO4NH/PItEanHxOtYEyC6B5RGFs8hSIBqHNkF0ihaC68JWg41to5LnoHXDd4ngkxODDic E/y2YyF+D+LQmtUw= X-Received: by 2002:adf:914e:: with SMTP id j72mr29812390wrj.109.1584962991021; Mon, 23 Mar 2020 04:29:51 -0700 (PDT) X-Google-Smtp-Source: ADFU+vslTSQ7xCR9n4plBG+WaLw6Q8/AzFaXYp9f+feH0KgjDbZvibAWYKH/15acs06uPXO6qtyZCQ== X-Received: by 2002:adf:914e:: with SMTP id j72mr29812363wrj.109.1584962990781; Mon, 23 Mar 2020 04:29:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 1/3] vhost-user-gpu: Release memory returned by vu_queue_pop() with free() Date: Mon, 23 Mar 2020 12:29:41 +0100 Message-Id: <20200323112943.12010-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200323112943.12010-1-philmd@redhat.com> References: <20200323112943.12010-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: Peter Maydell , "Michael S. Tsirkin" , qemu-stable@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" vu_queue_pop() returns memory that must be freed with free(). Cc: qemu-stable@nongnu.org Reported-by: Coverity (CID 1421887 ALLOC_FREE_MISMATCH) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- contrib/vhost-user-gpu/vhost-user-gpu.c | 4 ++-- contrib/vhost-user-gpu/virgl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-g= pu/vhost-user-gpu.c index b45d2019b4..a019d0a9ac 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -848,7 +848,7 @@ vg_handle_ctrl(VuDev *dev, int qidx) QTAILQ_INSERT_TAIL(&vg->fenceq, cmd, next); vg->inflight++; } else { - g_free(cmd); + free(cmd); } } } @@ -939,7 +939,7 @@ vg_handle_cursor(VuDev *dev, int qidx) } vu_queue_push(dev, vq, elem, 0); vu_queue_notify(dev, vq); - g_free(elem); + free(elem); } } =20 diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index 43413e29df..b0bc22c3c1 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -519,7 +519,7 @@ virgl_write_fence(void *opaque, uint32_t fence) g_debug("FENCE %" PRIu64, cmd->cmd_hdr.fence_id); vg_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); QTAILQ_REMOVE(&g->fenceq, cmd, next); - g_free(cmd); + free(cmd); g->inflight--; } } --=20 2.21.1 From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584963068; cv=none; d=zohomail.com; s=zohoarc; b=h3ynAhatBkXh3aSICPS0jHgLEHvVrrpwFRVRgnDHYYwO1xxh0DQXpRmZI0urZ+R/pIY/Lhyi+MvLs/HpIDNj2Lf2wbnYlYVI392C3jpn+MygfcdkOASX8J/33vUZtEQDB5eTfAKeUJ7IxLdcWOpkJAkfd7o0TQxEp5scQdLpadQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584963068; h=Content-Type:Content-Transfer-Encoding:Cc: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=qPJne7T1WNZJs4ZdrbGHhh572lickvYuJNMVK+NQPnU=; b=OkN+lQgSjTzi45Txw3oJDTJ++IdNajB2H0WOTz3YXBfevazYnxpoqHYv8KE8qlqv+6Rc4hsvIfXybGiniG4p5pap14Vns3PUgD8/hjYlTlM213MbwoOeCrIupwYKmYGD7aLIiMJMoUFUaOf1kqQtxwgtdNOBxjUri3sB9MPnQsA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1584963068633207.55463630366683; Mon, 23 Mar 2020 04:31:08 -0700 (PDT) Received: from localhost ([::1]:60472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLIR-00075N-Bk for importer@patchew.org; Mon, 23 Mar 2020 07:31:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42643) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLHO-0006BK-5A for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGLHM-0005pq-Qh for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:02 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:58021) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGLHM-0005pk-MY for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:00 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-0cnqywtgPCe95ckBqmkRfw-1; Mon, 23 Mar 2020 07:29:57 -0400 Received: by mail-wr1-f72.google.com with SMTP id d17so7234111wrw.19 for ; Mon, 23 Mar 2020 04:29:57 -0700 (PDT) Received: from localhost.localdomain (37.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.37]) by smtp.gmail.com with ESMTPSA id d13sm13644167wrv.34.2020.03.23.04.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 04:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584963000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qPJne7T1WNZJs4ZdrbGHhh572lickvYuJNMVK+NQPnU=; b=GHhpb+19BgMFNBz/bGBSHO+olLkNfPC+V8GHEJnn0UGCDoJlqSFPwfwMTzau+t6JY6uhrT 0H1SJsQgKFSeQo7I+xCKbhirzRpJ23Cr8no/uVPiTdYyEq8o4rNor2Bp5K1eVs7KFtMAHh 9go4ImU6DUsIuJr/2+RaBFeP9p52sEA= X-MC-Unique: 0cnqywtgPCe95ckBqmkRfw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CIpowIr4JfumkLzd2DtitMDVhlCsfUq7QdF+3HPa76w=; b=HERiHQ2tvR1rfRp/yjuIFf2/EcGlnID45AV9VVn3OU8gS/zQBIMzpiTnTaAHjLTJfL KiLLVSA7//pEap7RtCzPQOqidIKQAtNz0g3E8lWPnSp1JU5C7z14XuyW+xmLFXj32Cuq cgQNovSFDxVFjVsPoXAnpX7SVJXPvrlbRQl2CwCTo6GrD7y+WVrTEaks/zkM075vyAmv SCirZ63XYm5xqa0hx/LBi8JOACoz/CS5f32wChjvXsX7j0fviZx7faqXo1MbPPghS0Bo aY/CDbjCbgmVOhv9/UIxU1UXi9Tttn9EZEeBFj6N2J0cq9X5ruqww4AIXiqkMT3Y2nlz 1DAA== X-Gm-Message-State: ANhLgQ0ioR73DZpbpXa6CCP2n9Qf2vVjJpST7dZDZLkNdtyOuQ6aUFpA RUmUY3k+ixVCjWFahlQj7JToq0dqU2rh0xv31MqJhWYY2YInm1oRPp1cQF5HMZgKYgbJexfMRVG ny+9QAVyesEXLPOA= X-Received: by 2002:a1c:7c13:: with SMTP id x19mr4732361wmc.27.1584962996127; Mon, 23 Mar 2020 04:29:56 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvbiaNPng3Bz3jIx6AsQ7zih992PlLmauKj7QX7WqZnZ/87NqzP8GQ1BrG9p7AUL98ZyXo3cQ== X-Received: by 2002:a1c:7c13:: with SMTP id x19mr4732335wmc.27.1584962995895; Mon, 23 Mar 2020 04:29:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 2/3] virtio: Document virtqueue_pop() Date: Mon, 23 Mar 2020 12:29:42 +0100 Message-Id: <20200323112943.12010-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200323112943.12010-1-philmd@redhat.com> References: <20200323112943.12010-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Document that virtqueue_pop() returned memory must be released with free(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/hw/virtio/virtio.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index b69d517496..c6e3bfc500 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -199,6 +199,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElem= ent *elem, unsigned int len, unsigned int idx); =20 void virtqueue_map(VirtIODevice *vdev, VirtQueueElement *elem); +/** + * virtqueue_pop: + * @vq: a VirtQueue queue + * @sz: the size of struct to return (must be >=3D VirtQueueElement) + * + * Returns: a VirtQueueElement filled from the queue or NULL. + * The returned element must be free()-d by the caller. + */ void *virtqueue_pop(VirtQueue *vq, size_t sz); unsigned int virtqueue_drop_all(VirtQueue *vq); void *qemu_get_virtqueue_element(VirtIODevice *vdev, QEMUFile *f, size_t s= z); --=20 2.21.1 From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584963155; cv=none; d=zohomail.com; s=zohoarc; b=NeD1Q20/lfcHpFyBViy4wDPoSkl2qwTb0N93w7QiBb8EJoYrbC3tGZVIYzsq47iUf+asqdyBmrB3ZlW+h4OweW6L5rdO1ku4EHFxwy4ACGb/8ASKrPIrEHjgJe9mpj5wGW6ZLDJy7ZeD7umKvIaBQuVW4BKIXENo9YMPA9yvYP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584963155; h=Content-Type:Content-Transfer-Encoding:Cc: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=YY5Hl1kxBgBTjqar9z4p8DPMscyXhhaOdjtagcypCqI=; b=SseaM6tyAojD8z2JkRM5wMvdwCewwCuQmHHda8r7lErYBd4hih+68MlTO3GHURo+z+kE5TEZHca7kq+gEbXm3AZhzdOzcfScmQ+qB7/grPQ9JdUzIVyynu9jJGTcn678Qpk0L5JBqSa8hdjN0rstqc5B4WTnvH8i9NI5GWnKmOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1584963155929996.7660411338496; Mon, 23 Mar 2020 04:32:35 -0700 (PDT) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLJq-0000eY-L8 for importer@patchew.org; Mon, 23 Mar 2020 07:32:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42654) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGLHS-0006Em-6w for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGLHQ-0005sn-W4 for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:06 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:32062) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGLHQ-0005sf-Rm for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:30:04 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-4duAdFn5MRWBaiBCn_K4GA-1; Mon, 23 Mar 2020 07:30:02 -0400 Received: by mail-wm1-f71.google.com with SMTP id h203so3282633wme.2 for ; Mon, 23 Mar 2020 04:30:02 -0700 (PDT) Received: from localhost.localdomain (37.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.37]) by smtp.gmail.com with ESMTPSA id f1sm13331081wrv.37.2020.03.23.04.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 04:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584963004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YY5Hl1kxBgBTjqar9z4p8DPMscyXhhaOdjtagcypCqI=; b=Tazh16zmMbTHoxIWoyQASujWSsRowYAiYVxrugw0RAvmOoOz0q6FKrc6RhdN2bklRxzsuW al8CctnjRpEZYqPqx+58zo0Bl9kVzwnVYLqhNadA+rocpJ4HZC3kbmDBwln3338xYdd/DI z8xEjRo2uP5BNAHp+eP8RInbje9QxWc= X-MC-Unique: 4duAdFn5MRWBaiBCn_K4GA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b6LKcP8aR+D0NjOE1uN+dlp4t1btfpredi4xxYHm4B0=; b=IhvpTijbhe+tWmjvLxQVG/gJII56ew0RhmV2CaV6sDfPArFCS4nALoIOuE2IKUyQ3p TA/SijnMTvUJJHBQ55WVfSOsJVfNA+/4p5dud4MlUcAPTcjVnkDdheKFfev0e/0rBz7b ZXO9DxBGdULFhc/CQutCQ/7KCo2TMQERDH6iXXnZlde7eYJwaldYwtyvWzZVIA57Abkx S0wHh0aWMq2f8g29z2WrJs/ucJRiLbceBqUYtlNzdLnh/wiUgthhsnIchb2VfrlxREPX n//UG+tR/WiZ+ITcUL9FPBVSIom1/xkCEih3eKtwJLWWoilBZ0kdg+PPn+pPMisKoxqs vlTg== X-Gm-Message-State: ANhLgQ3VvacDlz7thzTtF5RYKG0oRyh4xL9q1jvwGBNMKn3XD3KItMFQ 1Y+3z+aIprKD2ZN8ZH75NIFFFHBZUKBcu1WjA69eUjmTNxhEd0J8oPhk28v83HImVHf9xufqLYm J8EDvuFLYV8xmZDM= X-Received: by 2002:a1c:23c8:: with SMTP id j191mr27194732wmj.117.1584963001169; Mon, 23 Mar 2020 04:30:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsWMsjwRMBjwY8vtRTvSm/jolqOocJNusU/5uKsVzbfTgGmPDkKemiQxJnIaHHXXSyKdUKkAg== X-Received: by 2002:a1c:23c8:: with SMTP id j191mr27194709wmj.117.1584963000904; Mon, 23 Mar 2020 04:30:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 3/3] virtio-gpu: Release memory returned by virtqueue_pop() with free() Date: Mon, 23 Mar 2020 12:29:43 +0100 Message-Id: <20200323112943.12010-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200323112943.12010-1-philmd@redhat.com> References: <20200323112943.12010-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" As virtio_gpu_handle_ctrl() fills the cmdq calling virtqueue_pop(), we need to release it with free() in virtio_gpu_reset(). virtio_gpu_handle_ctrl() allocates memory calling virtqueue_pop(), release it in virtio_gpu_process_cmdq() with free(). virtio_gpu_process_cmdq() move commands from cmdq to fenceq, so we also have to release them with free(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/virtio-gpu-3d.c | 2 +- hw/display/virtio-gpu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 96621576c2..3a97d267e5 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -506,7 +506,7 @@ static void virgl_write_fence(void *opaque, uint32_t fe= nce) trace_virtio_gpu_fence_resp(cmd->cmd_hdr.fence_id); virtio_gpu_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); QTAILQ_REMOVE(&g->fenceq, cmd, next); - g_free(cmd); + free(cmd); g->inflight--; if (virtio_gpu_stats_enabled(g->parent_obj.conf)) { fprintf(stderr, "inflight: %3d (-)\r", g->inflight); diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5f0dd7c150..f5fbb722ee 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -835,7 +835,7 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g) fprintf(stderr, "inflight: %3d (+)\r", g->inflight); } } else { - g_free(cmd); + free(cmd); } } } @@ -921,7 +921,7 @@ static void virtio_gpu_handle_cursor(VirtIODevice *vdev= , VirtQueue *vq) } virtqueue_push(vq, elem, 0); virtio_notify(vdev, vq); - g_free(elem); + free(elem); } } =20 @@ -1157,14 +1157,14 @@ static void virtio_gpu_reset(VirtIODevice *vdev) while (!QTAILQ_EMPTY(&g->cmdq)) { cmd =3D QTAILQ_FIRST(&g->cmdq); QTAILQ_REMOVE(&g->cmdq, cmd, next); - g_free(cmd); + free(cmd); } =20 while (!QTAILQ_EMPTY(&g->fenceq)) { cmd =3D QTAILQ_FIRST(&g->fenceq); QTAILQ_REMOVE(&g->fenceq, cmd, next); g->inflight--; - g_free(cmd); + free(cmd); } =20 #ifdef CONFIG_VIRGL --=20 2.21.1