Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package polkit for openSUSE:Factory checked in at 2022-02-23 16:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit (Old) and /work/SRC/openSUSE:Factory/.polkit.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "polkit" Wed Feb 23 16:25:48 2022 rev:81 rq:956662 version:0.120 Changes: -------- --- /work/SRC/openSUSE:Factory/polkit/polkit.changes 2022-01-27 23:16:41.795090219 +0100 +++ /work/SRC/openSUSE:Factory/.polkit.new.1958/polkit.changes 2022-02-23 16:26:15.815508430 +0100 @@ -1,0 +2,6 @@ +Tue Feb 22 10:48:15 UTC 2022 - Marcus Meissner <[email protected]> + +- Fixed denial of service via file descriptor leak (bsc#1195542 CVE-2021-4115) + 0001-CVE-2021-4115-GHSL-2021-077-fix.patch + +------------------------------------------------------------------- New: ---- 0001-CVE-2021-4115-GHSL-2021-077-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit.spec ++++++ --- /var/tmp/diff_new_pack.Mi9Nv1/_old 2022-02-23 16:26:16.495508454 +0100 +++ /var/tmp/diff_new_pack.Mi9Nv1/_new 2022-02-23 16:26:16.499508454 +0100 @@ -42,6 +42,8 @@ Patch5: CVE-2021-4034-pkexec-fix.patch # PATCH-FIX-UPSTREAM https://gitlab.freedesktop.org/polkit/polkit/-/commit/c7fc4e1b61f0fd82fc697c19c604af7e9fb291a2.patch, without .gitlab-ci.yml (not in the tarball) Patch6: duktape-support.patch +# PATCH-FIX-UPSTREAM 0001-CVE-2021-4115-GHSL-2021-077-fix.patch meissner@ -- bsc#1195542 VUL-0: CVE-2021-4115: polkit: denial of service via file descriptor leak +Patch7: 0001-CVE-2021-4115-GHSL-2021-077-fix.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: intltool ++++++ 0001-CVE-2021-4115-GHSL-2021-077-fix.patch ++++++ >From 41cb093f554da8772362654a128a84dd8a5542a7 Mon Sep 17 00:00:00 2001 From: Jan Rybar <[email protected]> Date: Mon, 21 Feb 2022 08:29:05 +0000 Subject: [PATCH] CVE-2021-4115 (GHSL-2021-077) fix --- src/polkit/polkitsystembusname.c | 38 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c index 8ed1363..2fbf5f1 100644 --- a/src/polkit/polkitsystembusname.c +++ b/src/polkit/polkitsystembusname.c @@ -62,6 +62,10 @@ enum PROP_NAME, }; + +guint8 dbus_call_respond_fails; // has to be global because of callback + + static void subject_iface_init (PolkitSubjectIface *subject_iface); G_DEFINE_TYPE_WITH_CODE (PolkitSystemBusName, polkit_system_bus_name, G_TYPE_OBJECT, @@ -364,6 +368,7 @@ on_retrieved_unix_uid_pid (GObject *src, if (!v) { data->caught_error = TRUE; + dbus_call_respond_fails += 1; } else { @@ -405,6 +410,8 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus tmp_context = g_main_context_new (); g_main_context_push_thread_default (tmp_context); + dbus_call_respond_fails = 0; + /* Do two async calls as it's basically as fast as one sync call. */ g_dbus_connection_call (connection, @@ -432,11 +439,34 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus on_retrieved_unix_uid_pid, &data); - while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error)) - g_main_context_iteration (tmp_context, TRUE); + while (TRUE) + { + /* If one dbus call returns error, we must wait until the other call + * calls _call_finish(), otherwise fd leak is possible. + * Resolves: GHSL-2021-077 + */ - if (data.caught_error) - goto out; + if ( (dbus_call_respond_fails > 1) ) + { + // we got two faults, we can leave + goto out; + } + + if ((data.caught_error && (data.retrieved_pid || data.retrieved_uid))) + { + // we got one fault and the other call finally finished, we can leave + goto out; + } + + if ( !(data.retrieved_uid && data.retrieved_pid) ) + { + g_main_context_iteration (tmp_context, TRUE); + } + else + { + break; + } + } if (out_uid) *out_uid = data.uid; -- 2.26.2
