From nobody Wed May 8 06:37:58 2024 Delivered-To: importer2@patchew.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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622456464; cv=none; d=zohomail.com; s=zohoarc; b=kXIVK1z4hSFb9IeT+pO7y2uY6LUEcJmBv0yFYD/Phex2aRUC5tsi+XQGXkM7VvkJebKCm/b9GVmVPa2TrP2r1H0CO5NbYnnKcPMWmDtB0yBWTe3Wg8imw3MjtXfOViOKphF0xxkuiHf9KxjqON7LvXaZODjMf0mskyGRG1B6nc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622456464; 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=GjoUfo5Mo0Gb5g3L2a2VLdQ5gJqfOOJ6GqIh+7WE+Jo=; b=ODY0Z1RjDsTs6kD8hwaTJGxzIcu+zc12ywEU6Z1p29MG1EevUfa0J81kfImPABP4z977IXIXO5p1OVcZNm91UbRpmdz+PMmYeqygIUu7nOx079z85n1kBwoCGS91uOfp+55BY62w8NjFAsDCPuRVmFErynHwmxkfYX/2Zb7IB84= 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+importer2=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 1622456464391978.4117082696965; Mon, 31 May 2021 03:21:04 -0700 (PDT) Received: from localhost ([::1]:54800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnf2d-0002uj-F5 for importer2@patchew.org; Mon, 31 May 2021 06:21:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnf1M-00024s-VZ for qemu-devel@nongnu.org; Mon, 31 May 2021 06:19:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnf1F-0006ei-3J for qemu-devel@nongnu.org; Mon, 31 May 2021 06:19:43 -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-226-9syNdhe4PbqfWhfb-DN95w-1; Mon, 31 May 2021 06:19:31 -0400 Received: by mail-wm1-f70.google.com with SMTP id r1-20020a05600c35c1b029018ec2043223so2965373wmq.7 for ; Mon, 31 May 2021 03:19:31 -0700 (PDT) Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id j101sm17790006wrj.66.2021.05.31.03.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 03:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622456375; 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=GjoUfo5Mo0Gb5g3L2a2VLdQ5gJqfOOJ6GqIh+7WE+Jo=; b=e78hIApdD4XnsI98yR6kQeY/D9/6wFuHCwgfERxfIxEMWNrRRb5cmS2/xqmDxCh7RZd6k3 m58VQajvcMxENsdv8z3GYUKsg/kH3d4aIVWWBVIAAAK4LVRLLChZlLApLz89eVxaAVqmBu oYDKd5otFI70WlqqWNAqqbD6BoA1t2M= X-MC-Unique: 9syNdhe4PbqfWhfb-DN95w-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:mime-version :content-transfer-encoding; bh=GjoUfo5Mo0Gb5g3L2a2VLdQ5gJqfOOJ6GqIh+7WE+Jo=; b=DtLgbi+1xMfjI55fstMc30jk0P0XfcSvTJyyMwjE2j6PylPpTg7iIDneSXJjINu7ZM 7u8w3jCqwFkWuPa8eJths9DQjHK9+CpffUm7lIxOVNsM5ISlSSzLjsqRcBNa+J/AEDxf lWs9/IQIctk69HX8GXDO3DqrYBJjneQ56hfxzEuYdxCiideZ5Q7foM57LpCW5ay7bEK5 wILMR2GPC4vc8A9eD1LYvpD3t4n8ZIgScI2cHdjp16t5+bGgo7HHXnIw5GY+TPP1NVt6 UZxgWN6GsFYXTnBpiaPrj8PLTGTrzOrLwtbKp+2TVgrYZHltLwCDA28jWBONSQCYgOcr odAg== X-Gm-Message-State: AOAM532Sm8hAX2FIHlSq/6pwO7PooO3sJQLOvIvUOMu4FxJwTOME5v9u FFVk1ruYoZW6bcLqOBH5qTOxzvzDTp0F8BEBXLG/ydjA4ucs2QhmbAVGuIj6uKqvnAH5YOg2Zf+ kguO02C/ygo4frvU= X-Received: by 2002:a1c:bdd6:: with SMTP id n205mr12735299wmf.74.1622456370589; Mon, 31 May 2021 03:19:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLP0LAKZTIowO2o/NzWBPXabaHeOisaZl2UW9VSebNEmQ0iJvSWf/Wdc32ZEwgOl9RbDVZaA== X-Received: by 2002:a1c:bdd6:: with SMTP id n205mr12735283wmf.74.1622456370392; Mon, 31 May 2021 03:19:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Vivek Kasireddy , qemu-devel@nongnu.org Subject: [RFC PATCH] hw/display/virtio-gpu: Fix memory leak (CID 1453811) Date: Mon, 31 May 2021 12:19:28 +0200 Message-Id: <20210531101928.1662732-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) To avoid leaking memory on the error path, reorder the code as: - check the parameters first - check resource already existing - finally allocate memory Reported-by: Coverity (CID 1453811: RESOURCE_LEAK) Fixes: e0933d91b1c ("virtio-gpu: Add virtio_gpu_resource_create_blob") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because the s->iov check is dubious. --- hw/display/virtio-gpu.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 4d549377cbc..8d047007bbb 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -340,8 +340,15 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU = *g, return; } =20 - res =3D virtio_gpu_find_resource(g, cblob.resource_id); - if (res) { + if (cblob.blob_mem !=3D VIRTIO_GPU_BLOB_MEM_GUEST && + cblob.blob_flags !=3D VIRTIO_GPU_BLOB_FLAG_USE_SHAREABLE) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid memory type\n", + __func__); + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + + if (virtio_gpu_find_resource(g, cblob.resource_id)) { qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n", __func__, cblob.resource_id); cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; @@ -352,25 +359,12 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU= *g, res->resource_id =3D cblob.resource_id; res->blob_size =3D cblob.size; =20 - if (cblob.blob_mem !=3D VIRTIO_GPU_BLOB_MEM_GUEST && - cblob.blob_flags !=3D VIRTIO_GPU_BLOB_FLAG_USE_SHAREABLE) { - qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid memory type\n", - __func__); - cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; - g_free(res); - return; - } - - if (res->iov) { - cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; - return; - } - ret =3D virtio_gpu_create_mapping_iov(g, cblob.nr_entries, sizeof(cblo= b), cmd, &res->addrs, &res->iov, &res->iov_cnt); - if (ret !=3D 0) { + if (ret !=3D 0 || res->iov) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; + g_free(res); return; } =20 --=20 2.26.3