From nobody Mon May 6 05:44:05 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=1656579456; cv=none; d=zohomail.com; s=zohoarc; b=Gi+N0Owmv5Ywm8aB7gpleXfCBIPsDzjr81YBrK6cUzhRbiEmsNNef9miFn/lQKD7hV3fvBR7guPOHmzMqg762cGG6ta+5434cRE48mcBOFQvhX4rnTWxTArbQ4HeBkHlHFGW9s0p7WTsfcBQv5oshe0dCZx5ydTjB56bsdiOF2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656579456; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=OoQRQIDJ3nnB1/GTgK6zSXC/n1Qlyx+581mVSBmvBDc=; b=RzP0G2vzVOW3BvW1Hs34Dnr/D35Y4QGCLs+k8VJPKoqVVa06jv8bDJI1GQIiDB4tehGOjDPuQKuUGXXdU/QUxneGxGYQs4Y+HLDJf73nWelvwqR7y9iz6lQVWsnZYre6sBpFAK73xAn/J7Hab41WHExhYp8tiE9lNcQpMlLBiw0= 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 16565794568001013.6572701253087; Thu, 30 Jun 2022 01:57:36 -0700 (PDT) Received: from localhost ([::1]:41112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6pzS-0003nt-JD for importer@patchew.org; Thu, 30 Jun 2022 04:57:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6puY-0008Rc-HV for qemu-devel@nongnu.org; Thu, 30 Jun 2022 04:52:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6puV-0003l7-LB for qemu-devel@nongnu.org; Thu, 30 Jun 2022 04:52:29 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-44-Hi9qnESpMwmwRkJe7EAGrA-1; Thu, 30 Jun 2022 04:52:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9834882A684; Thu, 30 Jun 2022 08:52:20 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.112]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 726F9C15D42; Thu, 30 Jun 2022 08:52:20 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3D01721E690D; Thu, 30 Jun 2022 10:52:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656579147; 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; bh=OoQRQIDJ3nnB1/GTgK6zSXC/n1Qlyx+581mVSBmvBDc=; b=h9VmxhIc5CnZGntQTFGBqOjhqxo921J3+kFgBAT0t8pKWOozFyKV3KJFXhttDozyQogZAR +N7FwCS2at/oQduD3w2Z61/F2TQtdkAZzkDcNLo6qm1EqvnFsIMu/TUAz7DdrafSvuexdW K3E4kkgBr4w3uPDN8hiBC2Ag2PvlmXM= X-MC-Unique: Hi9qnESpMwmwRkJe7EAGrA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: raphael.norwitz@nutanix.com, mst@redhat.com, qemu-trivial@nongnu.org Subject: [PATCH] contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement Date: Thu, 30 Jun 2022 10:52:19 +0200 Message-Id: <20220630085219.1305519-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.133.124; envelope-from=armbru@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.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656579457296100001 Content-Type: text/plain; charset="utf-8" We allocate VuVirtqElement with g_malloc() in virtqueue_alloc_element(), but free it with free() in vhost-user-blk.c. Harmless, but use g_free() anyway. One of the calls is guarded by a "not null" condition. Useless, because it cannot be null (it's dereferenced right before), and even it it could be, free() and g_free() do the right thing. Drop the conditional. Fixes: Coverity CID 1490290 Signed-off-by: Markus Armbruster Acked-by: Michael S. Tsirkin Reviewed-by: Raphael Norwitz --- Not even compile-tested, because I can't figure out how this thing is supposed to be built. Its initial commit message says "make vhost-user-blk", but that doesn't work anymore. contrib/vhost-user-blk/vhost-user-blk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-b= lk/vhost-user-blk.c index 9cb78ca1d0..d6932a2645 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -106,10 +106,7 @@ static void vub_req_complete(VubReq *req) req->size + 1); vu_queue_notify(vu_dev, req->vq); =20 - if (req->elem) { - free(req->elem); - } - + g_free(req->elem); g_free(req); } =20 @@ -243,7 +240,7 @@ static int vub_virtio_process_req(VubDev *vdev_blk, /* refer to hw/block/virtio_blk.c */ if (elem->out_num < 1 || elem->in_num < 1) { fprintf(stderr, "virtio-blk request missing headers\n"); - free(elem); + g_free(elem); return -1; } =20 @@ -325,7 +322,7 @@ static int vub_virtio_process_req(VubDev *vdev_blk, return 0; =20 err: - free(elem); + g_free(elem); g_free(req); return -1; } --=20 2.35.3