From: Peter Marko <peter.marko@siemens.com>
To: openembedded-devel@lists.openembedded.org
Cc: Peter Marko <peter.marko@siemens.com>
Subject: [meta-oe][scarthgap][PATCH] polkit: patch CVE-2026-4897 and CVE-2026-85498
Date: Mon, 14 Sep 2026 00:53:01 +0200 [thread overview]
Message-ID: <20260913225301.569833-1-peter.marko@siemens.com> (raw)
From: Peter Marko <peter.marko@siemens.com>
Pick patches mentioning these CVEs in their commit messages.
Note that patch for CVE-2026-4897 introduces CVE-2026-85498.
Also pick additional patch introduced between these commits which
touches the added code so the final patch applies cleanly.
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
.../polkit/files/CVE-2026-4897-01.patch | 64 +++++++++++++++++++
.../polkit/files/CVE-2026-4897-02.patch | 32 ++++++++++
.../polkit/files/CVE-2026-85498.patch | 38 +++++++++++
meta-oe/recipes-extended/polkit/polkit_124.bb | 3 +
4 files changed, 137 insertions(+)
create mode 100644 meta-oe/recipes-extended/polkit/files/CVE-2026-4897-01.patch
create mode 100644 meta-oe/recipes-extended/polkit/files/CVE-2026-4897-02.patch
create mode 100644 meta-oe/recipes-extended/polkit/files/CVE-2026-85498.patch
diff --git a/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-01.patch b/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-01.patch
new file mode 100644
index 0000000000..cd5f58c4f8
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-01.patch
@@ -0,0 +1,64 @@
+From 7e122c8a5120c2aae2d9d44a26796dc18f5b677c Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Fri, 27 Mar 2026 15:57:01 +0100
+Subject: [PATCH] CVE-2026-4897 - getline() string overflow
+
+Report and fix by Aisle.com
+Pavel Kohout, Aisle Research
+
+Signed-off-by: Jan Rybar jrybar@redhat.com
+
+CVE: CVE-2026-4897
+Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/7e122c8a5120c2aae2d9d44a26796dc18f5b677c]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/polkitagent/polkitagenthelperprivate.c | 23 +++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
+index 35bca85..7e4f94e 100644
+--- a/src/polkitagent/polkitagenthelperprivate.c
++++ b/src/polkitagent/polkitagenthelperprivate.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <errno.h>
+ #include <unistd.h>
+
+ #ifndef HAVE_CLEARENV
+@@ -60,21 +61,25 @@ read_cookie (int argc, char **argv)
+ return strdup (argv[2]);
+ else
+ {
+- char *ret = NULL;
+- size_t n = 0;
+- ssize_t r = getline (&ret, &n, stdin);
+- if (r == -1)
++ #define POLKIT_AGENT_MAX_COOKIE 4096
++ char buf[POLKIT_AGENT_MAX_COOKIE + 2]; /* +1 for newline, +1 for NUL */
++ if (fgets (buf, sizeof(buf), stdin) == NULL)
+ {
+ if (!feof (stdin))
+- perror ("getline");
+- free (ret);
++ perror ("fgets");
+ return NULL;
+ }
+- else
++ if (buf[strlen (buf) - 1] != '\n')
+ {
+- g_strchomp (ret);
+- return ret;
++ /* Cookie too long - drain remaining input and reject */
++ int c;
++ while ((c = getchar ()) != '\n' && c != EOF)
++ ;
++ errno = EOVERFLOW;
++ return NULL;
+ }
++ g_strchomp (buf);
++ return strdup (buf);
+ }
+ }
+
diff --git a/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-02.patch b/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-02.patch
new file mode 100644
index 0000000000..d9fb0e7e27
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/CVE-2026-4897-02.patch
@@ -0,0 +1,32 @@
+From 39601309eb3e5e88a1c1fbda9a272ba8691f1bf3 Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Wed, 13 May 2026 14:58:32 +0200
+Subject: [PATCH] Draining loop can keep polkit busy
+
+The draining loop is not really appropriate for pipe input, especially
+in a daemon.
+
+Co-authored-by: Frantisek Sumsal <fsumsal@redhat.com>
+
+CVE: CVE-2026-4897
+Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/39601309eb3e5e88a1c1fbda9a272ba8691f1bf3]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/polkitagent/polkitagenthelperprivate.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
+index 7e4f94e..c0a9825 100644
+--- a/src/polkitagent/polkitagenthelperprivate.c
++++ b/src/polkitagent/polkitagenthelperprivate.c
+@@ -71,10 +71,6 @@ read_cookie (int argc, char **argv)
+ }
+ if (buf[strlen (buf) - 1] != '\n')
+ {
+- /* Cookie too long - drain remaining input and reject */
+- int c;
+- while ((c = getchar ()) != '\n' && c != EOF)
+- ;
+ errno = EOVERFLOW;
+ return NULL;
+ }
diff --git a/meta-oe/recipes-extended/polkit/files/CVE-2026-85498.patch b/meta-oe/recipes-extended/polkit/files/CVE-2026-85498.patch
new file mode 100644
index 0000000000..b66d1e12d8
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/CVE-2026-85498.patch
@@ -0,0 +1,38 @@
+From eea172967848bb4c5a407329f40c0e45de0d187e Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Thu, 27 Aug 2026 15:02:45 +0200
+Subject: [PATCH] CVE-2026-85498: Unsanitized underflow in cookie input
+
+Credits for the report:
+Sunwoo Lee, Korea Institute of Energy Technology (KENTECH)
+Daeyoung Kang, Korea Institute of Energy Technology (KENTECH)
+Haeryong Park, Korea Internet & Security Agency (KISA)
+Hyuk Lim, Korea Institute of Energy Technology (KENTECH)
+Seunghyun Yoon, Korea Institute of Energy Technology (KENTECH)
+Juthawong Naisanguansee
+
+Co-authored-by: Jan Rybar <jrybar@redhat.com>
+
+CVE: CVE-2026-85498
+Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/eea172967848bb4c5a407329f40c0e45de0d187e]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/polkitagent/polkitagenthelperprivate.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
+index c0a9825..e2d2c9b 100644
+--- a/src/polkitagent/polkitagenthelperprivate.c
++++ b/src/polkitagent/polkitagenthelperprivate.c
+@@ -69,6 +69,11 @@ read_cookie (int argc, char **argv)
+ perror ("fgets");
+ return NULL;
+ }
++ if (buf[0] == '\0')
++ {
++ errno = EINVAL;
++ return NULL;
++ }
+ if (buf[strlen (buf) - 1] != '\n')
+ {
+ errno = EOVERFLOW;
diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_124.bb
index ba0fe47d7c..b7c167ac79 100644
--- a/meta-oe/recipes-extended/polkit/polkit_124.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_124.bb
@@ -9,6 +9,9 @@ SRC_URI = "\
git://github.com/polkit-org/polkit.git;protocol=https;branch=main \
file://CVE-2025-7519.patch \
file://meson-build-Support-openembedded-OS-for-PAM-config.patch \
+ file://CVE-2026-4897-01.patch \
+ file://CVE-2026-4897-02.patch \
+ file://CVE-2026-85498.patch \
"
S = "${WORKDIR}/git"
reply other threads:[~2026-09-13 23:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260913225301.569833-1-peter.marko@siemens.com \
--to=peter.marko@siemens.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.