From unknown Sat Jun 21 03:26:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48915] [PATCH] gnu: polkit: Graft a replacement for CVE-2021-3560. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Jun 2021 08:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48915@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162314192314569 (code B ref -1); Tue, 08 Jun 2021 08:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jun 2021 08:45:23 +0000 Received: from localhost ([127.0.0.1]:57357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqXMR-0003mv-Cd for submit@debbugs.gnu.org; Tue, 08 Jun 2021 04:45:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:48342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqXMP-0003mm-4s for submit@debbugs.gnu.org; Tue, 08 Jun 2021 04:45:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqXMO-0002sQ-S9 for guix-patches@gnu.org; Tue, 08 Jun 2021 04:45:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54024) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqXMO-0000dJ-JF; Tue, 08 Jun 2021 04:45:20 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60814 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqXMO-0003m9-AG; Tue, 08 Jun 2021 04:45:20 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 8 Jun 2021 10:45:12 +0200 Message-Id: <20210608084512.29608-1-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) 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: -3.3 (---) * gnu/packages/patches/polkit-CVE-2021-3560.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/polkit.scm (polkit/fixed): New variable. (polkit)[replacement]: New field. --- gnu/local.mk | 1 + .../patches/polkit-CVE-2021-3560.patch | 21 +++++++++++++++++++ gnu/packages/polkit.scm | 9 ++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/polkit-CVE-2021-3560.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0599df8968..42c5ee0d31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1555,6 +1555,7 @@ dist_patch_DATA = \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plotutils-spline-test.patch \ + %D%/packages/patches/polkit-CVE-2021-3560.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ diff --git a/gnu/packages/patches/polkit-CVE-2021-3560.patch b/gnu/packages/patches/polkit-CVE-2021-3560.patch new file mode 100644 index 0000000000..9aa0373fda --- /dev/null +++ b/gnu/packages/patches/polkit-CVE-2021-3560.patch @@ -0,0 +1,21 @@ +This patch fixes CVE-2021-3560, "local privilege escalation using +polkit_system_bus_name_get_creds_sync()": + + https://www.openwall.com/lists/oss-security/2021/06/03/1 + +Patch from . + +diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c +index 8daa12cb9093c1d765c7b83654a2b8d0d382378e..8ed13631508dd96624898df90ee2ece4dcf3e1e5 100644 +--- a/src/polkit/polkitsystembusname.c ++++ b/src/polkit/polkitsystembusname.c +@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus + while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error)) + g_main_context_iteration (tmp_context, TRUE); + ++ if (data.caught_error) ++ goto out; ++ + if (out_uid) + *out_uid = data.uid; + if (out_pid) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index d868aceec2..fcd8633b7a 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -44,6 +44,7 @@ (package (name "polkit") (version "0.116") + (replacement polkit/fixed) (source (origin (method url-fetch) (uri (string-append @@ -135,6 +136,14 @@ making process with respect to granting access to privileged operations for unprivileged applications.") (license lgpl2.0+))) +(define-public polkit/fixed + (package + (inherit polkit) + (version "0.11A") ;0.116 + patch + (source (origin + (inherit (package-source polkit)) + (patches (search-patches "polkit-CVE-2021-3560.patch")))))) + (define-public polkit-qt (package (name "polkit-qt") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 08 04:46:34 2021 Received: (at control) by debbugs.gnu.org; 8 Jun 2021 08:46:35 +0000 Received: from localhost ([127.0.0.1]:57362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqXNa-0003pV-Px for submit@debbugs.gnu.org; Tue, 08 Jun 2021 04:46:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqXNY-0003pF-Qa for control@debbugs.gnu.org; Tue, 08 Jun 2021 04:46:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54056) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqXNT-0001O3-I0 for control@debbugs.gnu.org; Tue, 08 Jun 2021 04:46:27 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60820 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqXNP-0005No-BZ for control@debbugs.gnu.org; Tue, 08 Jun 2021 04:46:26 -0400 Date: Tue, 08 Jun 2021 10:46:21 +0200 Message-Id: <87a6o0iw0y.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #48915 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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: -3.3 (---) tags 48915 + security quit From unknown Sat Jun 21 03:26:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48915] [PATCH] gnu: polkit: Graft a replacement for CVE-2021-3560. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Jun 2021 17:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 48915@debbugs.gnu.org Received: via spool by 48915-submit@debbugs.gnu.org id=B48915.16231747787306 (code B ref 48915); Tue, 08 Jun 2021 17:53:01 +0000 Received: (at 48915) by debbugs.gnu.org; 8 Jun 2021 17:52:58 +0000 Received: from localhost ([127.0.0.1]:59748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqfuI-0001tg-77 for submit@debbugs.gnu.org; Tue, 08 Jun 2021 13:52:58 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqfuD-0001tO-1l for 48915@debbugs.gnu.org; Tue, 08 Jun 2021 13:52:53 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id DC8275C0131; Tue, 8 Jun 2021 13:52:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 08 Jun 2021 13:52:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=ThDieCWt+YXPVUAy8e0S2YS2d1ZIYFpiVil9v/2jyvI=; b=dedb4AyMn3tx iLd99kUS8xHxXmJz30X2GD0b1R1AxzJNaLtLJfsBUsvEb5krV+3mQS+ETsxDorMl G2DwBXUVkAVGLOKE9Mh9/MylLpN4BUjwdY4mssmoBpb8b9b+1fA3aXd8c29VNngM WVfaRFw9mnAAMTfF55Vgj1yxcmgNA0E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=ThDieCWt+YXPVUAy8e0S2YS2d1ZIYFpiVil9v/2jy vI=; b=LkytN2CT53a5EUBGm7/0YZoFdBG8N49UzVLATnJ8umyzMpFxCt3KBZDR7 3dt9fg+GayZfBFcGWoe2dxLsdUAIt3sqC9U2Sb2uUammgrnbShZypUV8cZNqS1E+ BmOBFIdWcEoz46CfIWZGAIzX36FvU2wRG7ByH0fl0BEJyTtNLB5/2b+MRK8eYjdi IMOdLI54o528BZbUsyP48OcQG1wb/YRzlFm0rxaUCnwuQDJpOwTgriobKrmQyeag OUQlNq1YAYBMiF0VfEoIuwVFh+kcBGh2hTUH88jpG53L6OzBZJ3liZg/sA4foCu/ XefagwNGMuETWbNMylj3n7bBhBk1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedtledguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggugfgjsehtkeertddttddunecuhfhrohhmpefnvgho ucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrg htthgvrhhnpeeuueegudfgvdfgveeuvdeludelfeejhfeggfejtefggeekudekhfdvfeel jeehgfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Jun 2021 13:52:43 -0400 (EDT) Date: Tue, 8 Jun 2021 13:52:41 -0400 From: Leo Famulari Message-ID: References: <20210608084512.29608-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210608084512.29608-1-ludo@gnu.org> X-Spam-Score: -0.7 (/) 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.7 (-) On Tue, Jun 08, 2021 at 10:45:12AM +0200, Ludovic Courtès wrote: > +(define-public polkit/fixed > + (package > + (inherit polkit) > + (version "0.11A") ;0.116 + patch > + (source (origin > + (inherit (package-source polkit)) > + (patches (search-patches "polkit-CVE-2021-3560.patch")))))) Typically, we don't change the version when creating replacement packages that apply a patch. We only change the version when the replacement package actually updates to a new version. Thanks for taking care of this! From unknown Sat Jun 21 03:26:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48915] [PATCH] gnu: polkit: Graft a replacement for CVE-2021-3560. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Jun 2021 21:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security patch To: Leo Famulari Cc: 48915@debbugs.gnu.org Received: via spool by 48915-submit@debbugs.gnu.org id=B48915.162318796428400 (code B ref 48915); Tue, 08 Jun 2021 21:33:01 +0000 Received: (at 48915) by debbugs.gnu.org; 8 Jun 2021 21:32:44 +0000 Received: from localhost ([127.0.0.1]:59919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqjL1-0007Ny-UF for submit@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqjL0-0007Nk-9b for 48915@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47360) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqjKu-00008B-RM; Tue, 08 Jun 2021 17:32:36 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36242 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqjKu-0003bq-Jv; Tue, 08 Jun 2021 17:32:36 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210608084512.29608-1-ludo@gnu.org> Date: Tue, 08 Jun 2021 23:32:35 +0200 In-Reply-To: (Leo Famulari's message of "Tue, 8 Jun 2021 13:52:41 -0400") Message-ID: <87zgw0caa4.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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: -3.3 (---) Leo Famulari skribis: > On Tue, Jun 08, 2021 at 10:45:12AM +0200, Ludovic Court=C3=A8s wrote: >> +(define-public polkit/fixed >> + (package >> + (inherit polkit) >> + (version "0.11A") ;0.116 + patch >> + (source (origin >> + (inherit (package-source polkit)) >> + (patches (search-patches "polkit-CVE-2021-3560.patch"))))= )) > > Typically, we don't change the version when creating replacement > packages that apply a patch. We only change the version when the > replacement package actually updates to a new version. Pushed as 9178566954cc7f34d2d991d31df4565adad93508! As discussed on IRC, I ended up making =E2=80=98polkit/fixed=E2=80=99 priva= te, with the version string unchanged (inherited from =E2=80=98polkit=E2=80=99). We wondered whether Cuirass would build =E2=80=98polkit/fixed=E2=80=99 if i= t=E2=80=99s private. Turns out it does, but this comment in (gnu ci) is still valid: --8<---------------cut here---------------start------------->8--- (define (all-packages) "Return the list of packages to build." (define (adjust package result) (cond ((package-replacement package) ;; XXX: If PACKAGE and its replacement have the same name/versio= n, ;; then both Cuirass jobs will have the same name, which ;; effectively means that the second one will be ignored. Thus, ;; return the replacement first. (cons* (package-replacement package) ;build both package result)) --8<---------------cut here---------------end--------------->8--- IOW, the replacement, and only the replacement, gets built. The current =E2=80=98zstd=E2=80=99 replacement is private only shows derivations for the replacement, not for the original one. That=E2=80=99s okay though because the original one necessarily got built earlier. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 08 17:32:50 2021 Received: (at control) by debbugs.gnu.org; 8 Jun 2021 21:32:50 +0000 Received: from localhost ([127.0.0.1]:59922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqjL8-0007OK-6u for submit@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqjL6-0007O0-W4 for control@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47362) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqjL1-0000BO-Pn for control@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:43 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36244 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqjL1-0003cA-E3 for control@debbugs.gnu.org; Tue, 08 Jun 2021 17:32:43 -0400 Date: Tue, 08 Jun 2021 23:32:42 +0200 Message-Id: <87y2bkca9x.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #48915 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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: -3.3 (---) close 48915 quit