From nobody Wed Oct 23 01:31:44 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1727183524; cv=none; d=zohomail.com; s=zohoarc; b=BPDQ3lCeljoP8Jwmp0h293Zi+i8GxDuC6N4oJUDsTnSzczAncg/flwtPrMc5O6X7VVz/yx96PdItl3dZ3bOrFhV3JxHmSzRFBQBMjAxW5/+XnXBCQO+vvWz0lEhO+C8JLMhx3q9qebXwW4DIs8JC45jTk11OikSVMT8vWW4U9g0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727183524; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B8l9eC89X+1DxPUZjSpPht5D6DMQbUzcLG5D0Ldv6Xg=; b=EitfO9F6Z/83hrbRxydEFwn/AiEKd5RP7rSNp0BUDSOuOGMuiElNvuzAkjPHv/s3g2WFMsOUfbifXLQn7fP5yCy+USdNDSQWroa4yY46X/oLYdOwyrrkE2GQHAQ9aa8VJFoJQmGkN/IEG/GL+1g4gtePsq4GshXnEbDTVKdCWu8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727183524599742.8359834572697; Tue, 24 Sep 2024 06:12:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st5Hu-0002Cz-Ga; Tue, 24 Sep 2024 09:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st5HR-00015F-2K for qemu-devel@nongnu.org; Tue, 24 Sep 2024 09:08:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st5HP-0000u3-4z for qemu-devel@nongnu.org; Tue, 24 Sep 2024 09:08:36 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-vSZ_wSWsMBSxk5zmjsaE6g-1; Tue, 24 Sep 2024 09:08:02 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4AFE18E6DA6; Tue, 24 Sep 2024 13:07:58 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A2ADA19560AD; Tue, 24 Sep 2024 13:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727183285; 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=B8l9eC89X+1DxPUZjSpPht5D6DMQbUzcLG5D0Ldv6Xg=; b=WYxtDGmQiyiD2quQ8l0mbq9UmWdwvhWRJfTb6mgGgWE2VgkTjnHoboFNB5oreuRPnrEZSd mfqvjWDkAsrl0Z+02FK16QMU7UdABK2jgD+VLvt3ZLrtn5cn1x2Fuxw9SZTuTuD3i7n0b8 13s8e7m6vKr5NaZukl9XcNfyYtW1sb4= X-MC-Unique: vSZ_wSWsMBSxk5zmjsaE6g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Song Gao , Peter Xu , Bin Meng , Mahmoud Mandour , Hyman Huang , Klaus Jensen , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Marcel Apfelbaum , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , John Snow , Jesper Devantier , Bin Meng , Greg Kurz , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Stefan Hajnoczi , Yuval Shaia , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Vladimir Sementsov-Ogievskiy , Christian Schoenebeck , Pierrick Bouvier , Fabiano Rosas , Keith Busch , Eric Blake , qemu-block@nongnu.org, Kevin Wolf , Laurent Vivier , Gerd Hoffmann , Fam Zheng , Eduardo Habkost , Stefano Garzarella , Hanna Reitz , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 22/22] RFC: hw/virtio: a potential leak fix Date: Tue, 24 Sep 2024 17:05:53 +0400 Message-ID: <20240924130554.749278-23-marcandre.lureau@redhat.com> In-Reply-To: <20240924130554.749278-1-marcandre.lureau@redhat.com> References: <20240924130554.749278-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.09, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1727183526351116600 From: Marc-Andr=C3=A9 Lureau vhost_svq_get_buf() may return a VirtQueueElement that should be freed. It's unclear to me if the vhost_svq_get_buf() call should always return NUL= L. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost-shadow-virtqueue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index cd29cc795b..93742d9ddc 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -414,6 +414,7 @@ static uint16_t vhost_svq_last_desc_of_chain(const Vhos= tShadowVirtqueue *svq, return i; } =20 +G_GNUC_WARN_UNUSED_RESULT static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq, uint32_t *len) { @@ -529,6 +530,7 @@ size_t vhost_svq_poll(VhostShadowVirtqueue *svq, size_t= num) uint32_t r =3D 0; =20 while (num--) { + g_autofree VirtQueueElement *elem =3D NULL; int64_t start_us =3D g_get_monotonic_time(); =20 do { @@ -541,7 +543,7 @@ size_t vhost_svq_poll(VhostShadowVirtqueue *svq, size_t= num) } } while (true); =20 - vhost_svq_get_buf(svq, &r); + elem =3D vhost_svq_get_buf(svq, &r); len +=3D r; } =20 --=20 2.45.2.827.g557ae147e6