From unknown Sun Jun 22 11:43:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [PATCH gnome-team] Cogl: fix double free Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 08:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65798@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169407539731002 (code B ref -1); Thu, 07 Sep 2023 08:30:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Sep 2023 08:29:57 +0000 Received: from localhost ([127.0.0.1]:38506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOj-00083y-8G for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOf-00083i-G5 for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:55 -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 1qeAOX-0001iO-Ux for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:46 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qeAOV-0000HE-HF for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:45 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d6e91888 for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:mime-version:content-type :content-transfer-encoding:to:message-id; s=albinoniA; bh=Xy6LoK 8mouZp7SlzFRgcjPcj0cQ=; b=Io8AU56XDB7iNZLTBBa4LzHFPpykWEGjKCMHr7 yAPORMciHQ8vAAD78PGmwZbVYGogVICqNwRBMjHYodRC3VVvmcNcvGf4AZBDkGod wD8wEh3JZjldFyF56EEG+hTCwsYyvcG5HM+996xROYI0s6jN90puuG/ZG2KPd099 HXcuGhgkuNVwC7URIl19lP58Fp12EpJX9SkAuLNbx8/7w7nvMy01McxIW3uEg5uL 3ChGDmci19T3JrgsPQS+5BHMqzjtogu1mwjB7OgR57bn/U6jx9lhP3BSv3OlUdCG gKf5cLrCQ0gp0LKilECGvhL4NT0QxqwsyVfqNQ5ZVJt/mscw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id af13f608 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) From: Vivien Kraus Date: Thu, 7 Sep 2023 07:36:31 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the dispaly used by a cogl context twice. Since the cogl repository is read-only, this patch won’t be applied upstream. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +++- gnu/packages/patches/cogl-fix-double-free.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24fa8117c6..ae36dd49c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6b824c2832 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6131,7 +6131,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..67391f6300 --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,12 @@ +diff --git a/cogl-1.22.8/cogl/cogl-context.c b/cogl-1.22.8-fixed/cogl/cogl-context.c +index a7eed29..2280942 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -219,6 +219,7 @@ cogl_context_new (CoglDisplay *display, + } + + context->display = display; ++ cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e -- 2.41.0 From unknown Sun Jun 22 11:43:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [PATCH gnome-team v2] Cogl: fix double free References: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> In-Reply-To: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 20:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65798@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 65798-submit@debbugs.gnu.org id=B65798.169411863025789 (code B ref 65798); Thu, 07 Sep 2023 20:31:02 +0000 Received: (at 65798) by debbugs.gnu.org; 7 Sep 2023 20:30:30 +0000 Received: from localhost ([127.0.0.1]:41478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeLe2-0006ht-2e for submit@debbugs.gnu.org; Thu, 07 Sep 2023 16:30:30 -0400 Received: from planete-kraus.eu ([89.234.140.182]:45220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeLdz-0006hj-AN for 65798@debbugs.gnu.org; Thu, 07 Sep 2023 16:30:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 18ce9c06; Thu, 7 Sep 2023 20:30:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:mime-version:content-type :content-transfer-encoding:to:cc; s=albinoniA; bh=xtHwQxAEhFInu5 jvBG+8tGYc2+o=; b=H0oXZnLhnwWJxRpCuK6bMt9/Q9wpQRlpg8Q2YnB+bEdmDB qlKdYA3KNPj3/gjQpL8PziwM1QVR4OHw/LRzklq9o3lN0W8+ckJLx5z1FXfdWhxW swyG4Kk9fjMXipiHa1MA1vENVWV71jrNn9s/6LuJ4soGBUD2S/O99wkmBIb2bbzI LtwN3dsNl7aFGrTE9bQx4uA+4c0XHDgiXrfr5rATT8T3Y85fjQ63Pcyh1wLijZFB iQ1UXZW/IuE/klueJ4gf+6ZStPyYrZXt30o1KTEGFt/pktIqckwS++YcGk/k39UO s+JkGTHIUV5KPYFDmE+7Zhsce0Llj7ErdMYtiakw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 5339c475 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 7 Sep 2023 20:30:23 +0000 (UTC) Message-ID: <018c75fd44fa1b1462a49f5bf700b9194d9c6341.1694118524.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Thu, 7 Sep 2023 07:36:31 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User-Agent: Evolution 3.46.4 X-Spam-Score: 0.8 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the dispaly used by a cogl context twice. Since the cogl repository is read-only, this patch won’t be applied upstream. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 ++- .../patches/cogl-fix-double-free.patch | 31 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24fa8117c6..ae36dd49c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6b824c2832 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6131,7 +6131,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..7094c4cf02 --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,31 @@ +From 38d3fda8849ac327b473ac11dfac5499f595b7ac Mon Sep 17 00:00:00 2001 +Message-ID: <38d3fda8849ac327b473ac11dfac5499f595b7ac.1694118000.git.vivien@planete-kraus.eu> +In-Reply-To: +References: +From: Vivien Kraus +Date: Thu, 7 Sep 2023 22:16:48 +0200 +Subject: [PATCH 1/1] Prevent double free on context objects + +The display is unrefed in the context destructor, but not refed in the +constructor. + +This targets an archived (read-only) repository. +--- + cogl/cogl-context.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c +index a7eed29a..22809424 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -219,6 +219,7 @@ cogl_context_new (CoglDisplay *display, + } + + context->display = display; ++ cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a +-- +2.41.0 + base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e -- 2.41.0 From unknown Sun Jun 22 11:43:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [PATCH gnome-team v2] Cogl: fix double free Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Sep 2023 04:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 65798@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 65798-submit@debbugs.gnu.org id=B65798.169414706929786 (code B ref 65798); Fri, 08 Sep 2023 04:25:01 +0000 Received: (at 65798) by debbugs.gnu.org; 8 Sep 2023 04:24:29 +0000 Received: from localhost ([127.0.0.1]:41892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeT2i-0007kM-Sv for submit@debbugs.gnu.org; Fri, 08 Sep 2023 00:24:29 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:60512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeT2d-0007k3-LM for 65798@debbugs.gnu.org; Fri, 08 Sep 2023 00:24:27 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-522bd411679so2196011a12.0 for <65798@debbugs.gnu.org>; Thu, 07 Sep 2023 21:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694147055; x=1694751855; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=4hhqzNPYd68CHmuvcJ2deuoEVJD2Nm3uigcu69jFpe8=; b=Crzpu9ihN929p77GF5KIJINcGfEeR1H+WGRxN0W4j2HV2rteirwqzmzZwnM04cTG/y L8modWPEewPlUOhkigSGy4/nMSo9fIo53nO7X1EMMxdR6hFr0qXLqkwY7sKs70ljvvHp CWobPFmE9hb7QQ2WDJMaqowsnhYDxeT3blUUTrpF7N6q9iMrhUKngFwoZuCeP9xYvZhw +coILu+rPiQwv4DZhq06MSlQlzHXrPvzVVu5ymCnNo31PjiVP0WQMFX7wY32CBVCA6U0 e6Og0eKzPieZShTM/4HTWopQA64tO0vXXqiDaNJse4Fcvd+qYthd2HdU9r7NGC6oJhz0 SFCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694147055; x=1694751855; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4hhqzNPYd68CHmuvcJ2deuoEVJD2Nm3uigcu69jFpe8=; b=PyZLwogowp9DOih6yv0rD/OVwubo1ZPi/MpFyqCBYkDpkSceTr5Rz75velwB4AK4++ YEStyBiQEuEqFX/DlaluOG+5Kxm36La56+XtUjE0tj91FjLFJ+XFiWWf8Zd4dAUSfRrK 8E5aXJz7DLQP9ZyCyPsLikJ1Dn7wvK/nDIYjeqbSYPklNsu1pnYbUqUMdWmWuTi3hoQl fMuarGznYgyo/wZdCpSmN9EkalduO9HHrmv2JtKynNSdFc+1GREopf3Hu10NPHMe+iK6 rtM9dxGMLJCJ2onnih8TEYAffiZVav1dfnq2B9iFh0kUEihtGz4Gkwd+GNJNgDE/jg3N LxGw== X-Gm-Message-State: AOJu0YzbJHqlk6brvJGUuhX4rPYMK/HhBN8ceHkC1pKnScnxdf6v3NGw zOdNOn9AJwM7Fy5FTmrTq2k= X-Google-Smtp-Source: AGHT+IFdOS7vZCBVkHJb5yA9TCJW7DcQU3L0a55s+0D26jz8iCf7w0AsGy2Pti8JFzOvWWKQO3jsDw== X-Received: by 2002:a17:906:fa81:b0:9a1:cb2c:b55f with SMTP id lt1-20020a170906fa8100b009a1cb2cb55fmr885539ejb.53.1694147055312; Thu, 07 Sep 2023 21:24:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s4-20020a170906960400b00982cfe1fe5dsm468844ejx.65.2023.09.07.21.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 21:24:13 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 08 Sep 2023 06:24:12 +0200 In-Reply-To: <018c75fd44fa1b1462a49f5bf700b9194d9c6341.1694118524.git.vivien@planete-kraus.eu> References: <018c75fd44fa1b1462a49f5bf700b9194d9c6341.1694118524.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 07.09.2023 um 07:36 +0200 schrieb Vivien Kraus: > * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. > * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. > * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the > dispaly used by a cogl context twice. display Usually you do (patch, register, use) in this order, but I can rewrite the ChangeLog for you easily :) > Since the cogl repository is > read-only, this patch won=E2=80=99t be applied upstream. This information is not necessary in the ChangeLog. You could mention it before that, but I think keeping it in the patch itself is a better idea. > --- > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2= =A0 1 + > =C2=A0gnu/packages/gnome.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 |=C2=A0 4 ++- > =C2=A0.../patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 31 > +++++++++++++++++++ > =C2=A03 files changed, 35 insertions(+), 1 deletion(-) > =C2=A0create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 24fa8117c6..ae36dd49c9 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1024,6 +1024,7 @@ dist_patch_DATA > =3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/clucene-pkgconfig.patch=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/cmake-curl-certificates-3.24.patch=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/coda-use-system-libs.patch=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > +=C2=A0 %D%/packages/patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/collectd-5.11.0- > noinstallvar.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-awpm.patch=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-io-fix.patch=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 922d6ba24b..6b824c2832 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -6131,7 +6131,9 @@ (define-public cogl > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (version-major+minor version) "/" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "cogl-" version ".tar.xz")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (patches > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-patches "cogl-fix-dou= ble-free.patch")))) > =C2=A0=C2=A0=C2=A0=C2=A0 ;; NOTE: mutter exports a bundled fork of cogl, = so when making > changes to > =C2=A0=C2=A0=C2=A0=C2=A0 ;; cogl, corresponding changes may be appropriat= e in mutter as > well. This comment no longer applies to current mutter, for it has diverged far enough. > =C2=A0=C2=A0=C2=A0=C2=A0 (build-system gnu-build-system) > diff --git a/gnu/packages/patches/cogl-fix-double-free.patch > b/gnu/packages/patches/cogl-fix-double-free.patch > new file mode 100644 > index 0000000000..7094c4cf02 > --- /dev/null > +++ b/gnu/packages/patches/cogl-fix-double-free.patch > @@ -0,0 +1,31 @@ > +From 38d3fda8849ac327b473ac11dfac5499f595b7ac Mon Sep 17 00:00:00 > 2001 > +Message-ID: > <38d3fda8849ac327b473ac11dfac5499f595b7ac.1694118000.git.vivien@plane > te-kraus.eu> > +In-Reply-To: > +References: > +From: Vivien Kraus > +Date: Thu, 7 Sep 2023 22:16:48 +0200 > +Subject: [PATCH 1/1] Prevent double free on context objects > + > +The display is unrefed in the context destructor, but not refed in > the > +constructor. > + > +This targets an archived (read-only) repository. > +--- > + cogl/cogl-context.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c > +index a7eed29a..22809424 100644 > +--- a/cogl/cogl-context.c > ++++ b/cogl/cogl-context.c > +@@ -219,6 +219,7 @@ cogl_context_new (CoglDisplay *display, > +=C2=A0=C2=A0=C2=A0=C2=A0 } > +=20 > +=C2=A0=C2=A0 context->display =3D display; > ++=C2=A0 cogl_object_ref (display); You can use context->display =3D cogl_object_ref (display) if it works like g_object_ref. > +=20 > +=C2=A0=C2=A0 /* This is duplicated data, but it's much more convenient t= o have > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 the driver attached to the context and th= e value is accessed a > +--=20 > +2.41.0 > + >=20 > base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e Will see what CI has to say, otherwise LGTM. Cheers From unknown Sun Jun 22 11:43:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [gnome-team v3] Cogl: fix double free Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Sep 2023 05:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65798@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 65798-submit@debbugs.gnu.org id=B65798.16941497552337 (code B ref 65798); Fri, 08 Sep 2023 05:10:01 +0000 Received: (at 65798) by debbugs.gnu.org; 8 Sep 2023 05:09:15 +0000 Received: from localhost ([127.0.0.1]:41914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeTk2-0000bd-T6 for submit@debbugs.gnu.org; Fri, 08 Sep 2023 01:09:15 -0400 Received: from planete-kraus.eu ([89.234.140.182]:36332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeTjz-0000bT-L1 for 65798@debbugs.gnu.org; Fri, 08 Sep 2023 01:09:13 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id c061f4da; Fri, 8 Sep 2023 05:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=iR+LbM6R4SimH1IqGv4zp0GKbxw=; b=p edUMtkKdvXsxWdlLAl+J5sLuAxX/1oJ7Bh4zHy/H7404DORObR3FWrT3vXlGvFwh DRv1WljLTSSMlImVh8ezmyiPzP2SGYzPibj0KTBTo7NZogfB4xbp8JKgOHvZTShY 0M9Za+gb41ezb7lk8sy1apjRIcvQMJsBJb3A+9/2DvvJRKGEc/UALzrWzxf0yo7e gqQwoNNrLl8dfa2g3z6nfhwNuDOwfZglE5PVo+gAC1DuBJUHCcQDRDUkk08Gv0Bj fviuUpCKPFITGEMAWp9tYZeYoqvwlIUzN4K0IpQKfaCQHK60fcur155tyfvlew/u +wL5p80ZtVLMiiCyIPJ0w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 260be9c5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 8 Sep 2023 05:09:07 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Thu, 7 Sep 2023 07:36:31 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-Spam-Score: 0.8 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the dispaly used by a cogl context twice. * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. Remove the comment about the changes to be reflected in mutter, as their bundled cogl has diverged far enough. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 6 ++-- .../patches/cogl-fix-double-free.patch | 32 +++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24fa8117c6..ae36dd49c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..894aac8202 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6131,9 +6131,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) - ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to - ;; cogl, corresponding changes may be appropriate in mutter as well. + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..e7a994b33a --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,32 @@ +From 15d0f7d96cf53263196e26f2eb48ededdff0efeb Mon Sep 17 00:00:00 2001 +Message-ID: <15d0f7d96cf53263196e26f2eb48ededdff0efeb.1694148833.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Thu, 7 Sep 2023 22:16:48 +0200 +Subject: [PATCH] Prevent double free on context objects + +The display is unrefed in the context destructor, but not refed in the +constructor. + +This targets an archived (read-only) repository. +--- + cogl/cogl-context.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c +index a7eed29a..7cdc9fe7 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -218,7 +218,7 @@ cogl_context_new (CoglDisplay *display, + return NULL; + } + +- context->display = display; ++ context->display = cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a + +base-commit: 61d966c7442d521e38572b7f93ac7b8973a9c65e +-- +2.41.0 + base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e -- 2.41.0 From unknown Sun Jun 22 11:43:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [gnome-team v3] Cogl: fix double free Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Sep 2023 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 65798@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 65798-submit@debbugs.gnu.org id=B65798.16941923588751 (code B ref 65798); Fri, 08 Sep 2023 17:00:03 +0000 Received: (at 65798) by debbugs.gnu.org; 8 Sep 2023 16:59:18 +0000 Received: from localhost ([127.0.0.1]:45426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeepC-0002H4-37 for submit@debbugs.gnu.org; Fri, 08 Sep 2023 12:59:18 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:58368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeep8-0002Gp-UO for 65798@debbugs.gnu.org; Fri, 08 Sep 2023 12:59:16 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-9a64619d8fbso283924066b.0 for <65798@debbugs.gnu.org>; Fri, 08 Sep 2023 09:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694192347; x=1694797147; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=FVwnU04ctNOrE/tohBeB+0f1sXLR7isOIYGCaF89i20=; b=nT5dxaR/bJGGA0NQERKhgACK9O1ZOrhjkwyWZbiWTlmeigzZcdsfigSotkoDbkeN8v vIZc4FY4ZQWm/9mmwclamyY+JzSAs7h5el4yPWgAlB6XQVRFNv5cfmKnpQxpw38CbKEu SByXhdEiS8b8JRokSV1WFESRme8Gllj7MqeCxVnjo5aSEM55dkMq8JejpsA5AAHO121D MtOw13QowMkvnvWUhmBQaSUq7A1VfvnPHcvVzhaQb0hwDtXkWxhdXzryfL7MbJti1ySu pnKeFPRB1rA4B+bI8cl5ENRWNmhd7c+iboxCaIhv0jf5QmKSgb1gQur+xml/xeCCHRN5 1Oxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694192347; x=1694797147; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FVwnU04ctNOrE/tohBeB+0f1sXLR7isOIYGCaF89i20=; b=AfvpfZ0c2Xbd5ZtWgoi9Z1LbIRuaZd/4Ei74tECG/AOJ/uELydy+gqIN1DqaCq6fsU ikepr+QieA4VDxmxE+uPECXnd70MJRwgHzr5Mfd++xpV3oqZdWjsDntCSOGQyz8/ucz4 tq0t3qSFsAY5yLqFKSJPSCX9n6Vxa4mecVN/gb5LZcejxOKuyp7pagUle03ha0Jn1QGl Y127tvdNV6eywAbhUaEUCqR9xCHIjv+6Tw/cg3RZijiGf88XdwhlrOb63BqIKhK3WoV8 CWjWEiW/UBBvN28Y6bvEcLwhgvbGZg4ezl/l8Q1J8gLTJhKK02+PajBCt4INAKiRCfWF X2gQ== X-Gm-Message-State: AOJu0YyaP6oso1WeP3p4W76u8P9vuvjZafXaNibBsd+N1uTU0kOjUOil v4fIDpcYamrIUAcYcBdRGRY= X-Google-Smtp-Source: AGHT+IEB/TNM1dYwZHaywjeFB38WhGH/zV6GwogWmB1DlN/8qpOfQGZ/WIxRxFWmSLFTB84RMEEOKQ== X-Received: by 2002:a17:906:70d6:b0:969:93f2:259a with SMTP id g22-20020a17090670d600b0096993f2259amr2357354ejk.73.1694192346745; Fri, 08 Sep 2023 09:59:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ck8-20020a170906c44800b009a5f1d1564dsm1256040ejb.126.2023.09.08.09.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 09:59:05 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 08 Sep 2023 18:59:05 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 07.09.2023 um 07:36 +0200 schrieb Vivien Kraus: > * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the > dispaly used by a cogl context twice. To whom commits this (likely me in the future): s/dispaly/display/ > * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. > * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. > Remove the > comment about the changes to be reflected in mutter, as their bundled > cogl has > diverged far enough. I'll also add a blurb before the ChangeLog and shorten this to make the change clearer. > --- > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2= =A0 1 + > =C2=A0gnu/packages/gnome.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 |=C2=A0 6 ++-- > =C2=A0.../patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 32 > +++++++++++++++++++ > =C2=A03 files changed, 36 insertions(+), 3 deletions(-) > =C2=A0create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 24fa8117c6..ae36dd49c9 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1024,6 +1024,7 @@ dist_patch_DATA > =3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/clucene-pkgconfig.patch=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/cmake-curl-certificates-3.24.patch=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/coda-use-system-libs.patch=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > +=C2=A0 %D%/packages/patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/collectd-5.11.0- > noinstallvar.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-awpm.patch=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-io-fix.patch=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 922d6ba24b..894aac8202 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -6131,9 +6131,9 @@ (define-public cogl > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (version-major+minor version) "/" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "cogl-" version ".tar.xz")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) > -=C2=A0=C2=A0=C2=A0 ;; NOTE: mutter exports a bundled fork of cogl, so wh= en making > changes to > -=C2=A0=C2=A0=C2=A0 ;; cogl, corresponding changes may be appropriate in = mutter as > well. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (patches > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-patches "cogl-fix-dou= ble-free.patch")))) > =C2=A0=C2=A0=C2=A0=C2=A0 (build-system gnu-build-system) > =C2=A0=C2=A0=C2=A0=C2=A0 (native-inputs > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(("glib:bin" ,glib "bin")=C2=A0=C2=A0=C2= =A0=C2=A0 ; for glib-mkenums > diff --git a/gnu/packages/patches/cogl-fix-double-free.patch > b/gnu/packages/patches/cogl-fix-double-free.patch > new file mode 100644 > index 0000000000..e7a994b33a > --- /dev/null > +++ b/gnu/packages/patches/cogl-fix-double-free.patch > @@ -0,0 +1,32 @@ > +From 15d0f7d96cf53263196e26f2eb48ededdff0efeb Mon Sep 17 00:00:00 > 2001 > +Message-ID: > <15d0f7d96cf53263196e26f2eb48ededdff0efeb.1694148833.git.vivien@plane > te-kraus.eu> > +From: Vivien Kraus > +Date: Thu, 7 Sep 2023 22:16:48 +0200 > +Subject: [PATCH] Prevent double free on context objects > + > +The display is unrefed in the context destructor, but not refed in > the > +constructor. > + > +This targets an archived (read-only) repository. > +--- > + cogl/cogl-context.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c > +index a7eed29a..7cdc9fe7 100644 > +--- a/cogl/cogl-context.c > ++++ b/cogl/cogl-context.c > +@@ -218,7 +218,7 @@ cogl_context_new (CoglDisplay *display, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return NULL; > +=C2=A0=C2=A0=C2=A0=C2=A0 } > +=20 > +-=C2=A0 context->display =3D display; > ++=C2=A0 context->display =3D cogl_object_ref (display); > +=20 > +=C2=A0=C2=A0 /* This is duplicated data, but it's much more convenient t= o have > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 the driver attached to the context and th= e value is accessed a > + > +base-commit: 61d966c7442d521e38572b7f93ac7b8973a9c65e > +--=20 > +2.41.0 > + >=20 > base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e LGTM, now waiting for CI to build it. Cheers From unknown Sun Jun 22 11:43:44 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vivien Kraus Subject: bug#65798: closed (Re: [gnome-team v3] Cogl: fix double free) Message-ID: References: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> X-Gnu-PR-Message: they-closed 65798 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65798@debbugs.gnu.org Date: Fri, 15 Sep 2023 16:19:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1694794742-7532-1" This is a multi-part message in MIME format... ------------=_1694794742-7532-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65798: [PATCH gnome-team] Cogl: fix double free which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65798@debbugs.gnu.org. --=20 65798: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65798 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1694794742-7532-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65798-done) by debbugs.gnu.org; 15 Sep 2023 16:18:06 +0000 Received: from localhost ([127.0.0.1]:44547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhBW9-0001vp-UW for submit@debbugs.gnu.org; Fri, 15 Sep 2023 12:18:06 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:55791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhBW8-0001vG-1D for 65798-done@debbugs.gnu.org; Fri, 15 Sep 2023 12:18:05 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-99de884ad25so308938266b.3 for <65798-done@debbugs.gnu.org>; Fri, 15 Sep 2023 09:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694794671; x=1695399471; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=iXWQPEr40XzztBxIfrtt2sRiRSOC0bkiO/ZWR505o2E=; b=UerFtdZzcYdzAXspbJ743YFS/AyqIeRpXjwxLZTbSsJoLpwUrvm3qJZV4BtZjnSEKM ATS3zELUlXYxXLEpv05GaS/ZFRwTT9ri4zHAK1IMPbAQjXcH4MJVrarsOi1hjekp5htS hwaIuZ1IclXdqEo94qk9cF2E6y1GdvyUBM+kM+3rSlaJ4K7sCaIYj9ZDO8WiNes+7Wra sZnG8+xtxMYIVq2qbn87ufAhmmjytBffFi6KZuS6yVV6etcLx/X9YWxZ8tVn6JG4Btpr UVM5hM+v0sjxM3sGvF8vv6Uis3ZP+jh0t6qAhjOaxU80YqI/UDGUbNkfnGfkHAIF+ni6 TGbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694794671; x=1695399471; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iXWQPEr40XzztBxIfrtt2sRiRSOC0bkiO/ZWR505o2E=; b=BrgMzZjZs4KIPrhLQ86VD6ZiFMrgjQgt6+N570Kn0Sp94u6T0VHGos9j3NqxGTcz9U Orao0fl2faRDEQt1BMvSPT/sxQYG9mFK2ZyfDkROMScva5S8aowVTr/yyK/MvcpA2AtC sygzoqNiXybbwFKDzQsza4xZJ2+QfWOTAGHgOIq92y8ociXH/s42mxa1mlxk+2dyNVST MpwyprL/kaclXUofv2vR9rUUl0daOSp0r1BTxZbtxwn0r/hn0tApClknTYXu00t6ZjDV YKDg+G9vwHuAAD+WYTn2FQVPHmNJeuRWSJ3ds7KwRIOEMt0edylPqtMuZP6GlXs8JaWP NIYw== X-Gm-Message-State: AOJu0YwDiABlPAFgZ1qEWNctPqBDDa3RFBsLaFO3H/P1wHto5X64iqLX fDYKDsUBxYKHjz6a5QnAzoG5fGGnncPOJlMd X-Google-Smtp-Source: AGHT+IFGZQe6HVhlEXvAcUzEghzRERNVUpaBbSGJ1do5svt/48wC/OBLFIqCB6GXl0vw5Qq31/KMAA== X-Received: by 2002:a17:906:101e:b0:9aa:181:89c0 with SMTP id 30-20020a170906101e00b009aa018189c0mr2027061ejm.67.1694794671189; Fri, 15 Sep 2023 09:17:51 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z21-20020a170906241500b0099b76c3041csm2626177eja.7.2023.09.15.09.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:17:50 -0700 (PDT) Message-ID: Subject: Re: [gnome-team v3] Cogl: fix double free From: Liliana Marie Prikler To: Vivien Kraus , 65798-done@debbugs.gnu.org Date: Fri, 15 Sep 2023 18:17:47 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65798-done Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 08.09.2023 um 18:59 +0200 schrieb Liliana Marie Prikler: > LGTM, now waiting for CI to build it. QA green, it's merge time. Thanks ------------=_1694794742-7532-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Sep 2023 08:29:57 +0000 Received: from localhost ([127.0.0.1]:38506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOj-00083y-8G for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOf-00083i-G5 for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:55 -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 1qeAOX-0001iO-Ux for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:46 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qeAOV-0000HE-HF for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:45 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d6e91888 for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:mime-version:content-type :content-transfer-encoding:to:message-id; s=albinoniA; bh=Xy6LoK 8mouZp7SlzFRgcjPcj0cQ=; b=Io8AU56XDB7iNZLTBBa4LzHFPpykWEGjKCMHr7 yAPORMciHQ8vAAD78PGmwZbVYGogVICqNwRBMjHYodRC3VVvmcNcvGf4AZBDkGod wD8wEh3JZjldFyF56EEG+hTCwsYyvcG5HM+996xROYI0s6jN90puuG/ZG2KPd099 HXcuGhgkuNVwC7URIl19lP58Fp12EpJX9SkAuLNbx8/7w7nvMy01McxIW3uEg5uL 3ChGDmci19T3JrgsPQS+5BHMqzjtogu1mwjB7OgR57bn/U6jx9lhP3BSv3OlUdCG gKf5cLrCQ0gp0LKilECGvhL4NT0QxqwsyVfqNQ5ZVJt/mscw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id af13f608 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) From: Vivien Kraus Date: Thu, 7 Sep 2023 07:36:31 +0200 Subject: [PATCH gnome-team] Cogl: fix double free MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: guix-patches@gnu.org Message-ID: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the dispaly used by a cogl context twice. Since the cogl repository is read-only, this patch won’t be applied upstream. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +++- gnu/packages/patches/cogl-fix-double-free.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24fa8117c6..ae36dd49c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6b824c2832 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6131,7 +6131,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..67391f6300 --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,12 @@ +diff --git a/cogl-1.22.8/cogl/cogl-context.c b/cogl-1.22.8-fixed/cogl/cogl-context.c +index a7eed29..2280942 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -219,6 +219,7 @@ cogl_context_new (CoglDisplay *display, + } + + context->display = display; ++ cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e -- 2.41.0 ------------=_1694794742-7532-1--