From patchwork Fri Feb 17 17:00:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47046 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 825041685E; Fri, 17 Feb 2023 17:03:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B11311688A for ; Fri, 17 Feb 2023 17:03:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT47w-00070o-7f; Fri, 17 Feb 2023 12:02:28 -0500 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 1pT47a-0006me-OO for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT47Z-0000LD-Qh for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47Z-00082V-MA for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 08/21] gnu: virglrenderer: Update to 0.7.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665329530687 (code B ref 61576); Fri, 17 Feb 2023 17:02:05 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:35 +0000 Received: from localhost ([127.0.0.1]:41352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT474-0007yg-P7 for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:35 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:42947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46y-0007wl-G9 for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:29 -0500 Received: by mail-qt1-f182.google.com with SMTP id t8so1236811qtp.9 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/6A4ZcW4y0X5lFulIAqBO0bzLipVlR1uW4wgJ0n4m7Q=; b=Usj8QOC+y+Du111htCMZhhKzWCPCynWqksmC+zxAwD3QgkOduX+tSvn1CNxmZuhTNQ vn/LZTxA+Z9aYokYngG7KRbwsKIYJ5m1IbBA6uxwp3VdDcgXrr53fwXv5eGZ1Z5yxSDa 5gBI/+weUirHz8JDy3gSvMHibpxhhBidfl50sHH4hQfF6EznkhI68lW1EF7jYhDvT708 j0U8A0kEl51UKArOasW72Y7HK+Mf5O/yTK2uWgSlyQf7YTjUijgU9uKUjtywrddDFpdY bxBYjfteNEt1cvWmkVFqd5mX4FjQUbdJ/JcAJMLG2GmBt1N2X80cUW9p0+E7eiURWGJU 6FdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/6A4ZcW4y0X5lFulIAqBO0bzLipVlR1uW4wgJ0n4m7Q=; b=UvQtfQRnz3BQlJk8JogCMAR0i2DV78meIqOs41o4tWYa+YZxRcPd0rxObXrmb/egXN MfOPD1TVYsItWi0ZImdn2CrMElLxclAhI0z3BvV3+rPd4Tb8oUhlDUVh3ax3M6rDmJR0 SZ5KwoCwXIK4B4g/jvb3j3fTsAPTLI8qW6Y1xtyrYMIj0jLtu2Ir1x24/3XkSoXKxkbs BhxlHGZb2lrZt9yGEjNNxWc+L3F3HR25YPQN1ai1maQo2Q6Dw9TN/0Bh5GMIM/qz3X0C grXgKQAkrH/XIrtiSrEEoEdCFMP7GCt1mWLNETORMFIsqm1De8uO1sMxTX+k9t5zMYK8 zxTw== X-Gm-Message-State: AO0yUKUJeq48umftAI4nrb2JZhYSmz2vAXfJghkXPKduPOf9wL3XVEqu SEyTgZoF25EFHBA9dZXwS3mL4WZx9eVcoF64 X-Google-Smtp-Source: AK7set+WGW2dZST3vrPK554Ft4tyiF6N+9zs9QEdBX8Zpy7p8jFvBKCFMbusMZfhqZaK1jCyRtRa6A== X-Received: by 2002:a05:622a:1051:b0:3b8:2ce4:3e9 with SMTP id f17-20020a05622a105100b003b82ce403e9mr3742454qte.32.1676653282869; Fri, 17 Feb 2023 09:01:22 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:22 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:49 -0500 Message-Id: <20230217170103.10147-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/spice.scm (virglrenderer): Update to 0.7.0. Remove patch. Re-indent and sort inputs. * gnu/packages/patches/virglrenderer-CVE-2017-6386.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - .../patches/virglrenderer-CVE-2017-6386.patch | 54 ------------------- gnu/packages/spice.scm | 11 ++-- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/virglrenderer-CVE-2017-6386.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5fcbdd4586..19bb32c95e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1985,7 +1985,6 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ - %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ diff --git a/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch b/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch deleted file mode 100644 index bd3bf106bf..0000000000 --- a/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix CVE-2017-6386 (memory leak introduced by fix for CVE-2017-5994). - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5994 - -Patch copied from upstream source repository: - -https://cgit.freedesktop.org/virglrenderer/commit/?id=737c3350850ca4dbc5633b3bdb4118176ce59920 - -From 737c3350850ca4dbc5633b3bdb4118176ce59920 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Tue, 28 Feb 2017 14:52:09 +1000 -Subject: renderer: fix memory leak in vertex elements state create - -Reported-by: Li Qiang -Free the vertex array in error path. -This was introduced by this commit: -renderer: fix heap overflow in vertex elements state create. - -I rewrote the code to not require the allocation in the first -place if we have an error, seems nicer. - -Signed-off-by: Dave Airlie - -diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c -index 1bca7ad..e5d9f5c 100644 ---- a/src/vrend_renderer.c -+++ b/src/vrend_renderer.c -@@ -1648,18 +1648,19 @@ int vrend_create_vertex_elements_state(struct vrend_context *ctx, - unsigned num_elements, - const struct pipe_vertex_element *elements) - { -- struct vrend_vertex_element_array *v = CALLOC_STRUCT(vrend_vertex_element_array); -+ struct vrend_vertex_element_array *v; - const struct util_format_description *desc; - GLenum type; - int i; - uint32_t ret_handle; - -- if (!v) -- return ENOMEM; -- - if (num_elements > PIPE_MAX_ATTRIBS) - return EINVAL; - -+ v = CALLOC_STRUCT(vrend_vertex_element_array); -+ if (!v) -+ return ENOMEM; -+ - v->count = num_elements; - for (i = 0; i < num_elements; i++) { - memcpy(&v->elements[i].base, &elements[i], sizeof(struct pipe_vertex_element)); --- -cgit v0.10.2 - diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index fc63b7228f..46bb9844f2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -84,21 +84,18 @@ (define-public usbredir (define-public virglrenderer (package (name "virglrenderer") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/virgl/" "virglrenderer-" version ".tar.bz2")) - (patches (search-patches "virglrenderer-CVE-2017-6386.patch")) (sha256 (base32 - "06kf0q4l52gzx5p63l8850hff8pmhp7xv1hk8zgx2apbw18y6jd5")))) + "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m")))) (build-system gnu-build-system) - (inputs - (list libepoxy mesa eudev)) - (native-inputs - (list pkg-config)) + (inputs (list eudev libepoxy mesa)) + (native-inputs (list pkg-config)) (synopsis "Virtual 3D GPU library") (description "A virtual 3D GPU library that enables a virtualized operating system to use the host GPU to accelerate 3D rendering.")