Patch review
v2 cover Patch review
Hello,
Since I made some mistakes with the previous patch review request and I got some reviews and new patches. I send this one updated:v1->v2:
* Dropped "mesa: fix build error with llvmpipe gallium driver"
* Replaced "expat: patch CVE-2026-24515" by
"expat: upgrade 2.7.3 -> 2.7.4"
* Added:
* libxml2: patch CVE-2026-0992
* libxml2: add follow-up patch for CVE-2026-0992
* inetutils: patch CVE-2026-24061
Note that "inetutils: patch CVE-2026-24061" and "libxml2: add follow-up patch for CVE-2026-0992" have yet to merge on master but I expect that to happen soon (If that does not, I will exclude those from the merge)
Please review this set of changes for whinlatter and have comments back by end of day Wednesday, February 4 (shorted than usual but the series has not changed that much)
Passed a-full on autobuilder with some failures:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3160
* https://autobuilder.yoctoproject.org/valkyrie/?#/builders/8/builds/3155 (qemuarm64-armhost) was automatically and successfully retried as
https://autobuilder.yoctoproject.org/valkyrie/?#/builders/8/builds/3157
* https://autobuilder.yoctoproject.org/valkyrie/#/builders/41/builds/2964 (meta-intel) This failure also happens on master, I've pinged the maintainer:
https://lists.yoctoproject.org/g/yocto/message/66209
The following changes since commit fa31089d48cac2aa11279e932a77f4dbdc02c02d:
libarchive: upgrade 3.8.4 -> 3.8.5 (2026-01-26 08:44:38 +0000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/whinlatter-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/whinlatter-nut
for you to fetch changes up to fa3bb54d2423728b6421367c1218003a0765dd22:
inetutils: patch CVE-2026-24061 (2026-02-03 00:09:50 +0100)
Hugo SIMELIERE (1):
libtasn1: Fix CVE-2025-13151
Jiaying Song (1):
grub: fix CVE-2025-54770 CVE-2025-61661 CVE-2025-61662 CVE-2025-61663
CVE-2025-61664
Ken Kurematsu (1):
libtheora: set CVE_PRODUCT
Khai Dang (1):
docbook-xml-dtd4: fix the fetching failure
Mark Hatle (1):
dpkg: Fix ADMINDIR
Mathieu Dubois-Briand (2):
oeqa/gitarchive: Fix git push URL parameter oeqa/gitarchive: Push tag before copying log files
Peter Marko (13):
go: upgrade 1.25.5 -> 1.25.6
zlib: ignore CVE-2026-22184
python3-urllib3: patch CVE-2026-21441
glibc: stable 2.42 branch updates
dropbear: patch CVE-2025-14282
libpng: upgrade 1.6.53 -> 1.6.54
glib-2.0: patch CVE-2026-0988
libxml2: patch CVE-2026-0989
libxml2: patch CVE-2026-0990
libxml2: patch CVE-2026-0992
libxml2: add follow-up patch for CVE-2026-0992
expat: upgrade 2.7.3 -> 2.7.4
inetutils: patch CVE-2026-24061
Richard Purdie (2):
scripts/oe-git-archive: Ensure new push parameter is specified
pseudo: Update to 1.9.3 release
meta/lib/oe/package_manager/deb/__init__.py | 4 +
.../oeqa/selftest/cases/gitarchivetests.py | 4 +-
meta/lib/oeqa/utils/gitarchive.py | 8 +-
.../grub/files/CVE-2025-54770.patch | 41 +++
.../grub/files/CVE-2025-61661.patch | 40 +++
.../grub/files/CVE-2025-61662.patch | 72 ++++
.../grub/files/CVE-2025-61663_61664.patch | 64 ++++
meta/recipes-bsp/grub/grub2.inc | 4 +
.../inetutils/CVE-2026-24061-01.patch | 38 ++
.../inetutils/CVE-2026-24061-02.patch | 82 +++++
.../inetutils/inetutils_2.6.bb | 2 +
.../dropbear/dropbear/CVE-2025-14282-01.patch | 280 +++++++++++++++
.../dropbear/dropbear/CVE-2025-14282-02.patch | 97 +++++
.../dropbear/dropbear/CVE-2025-14282-03.patch | 282 +++++++++++++++
.../dropbear/dropbear/CVE-2025-14282-04.patch | 72 ++++
.../dropbear/dropbear/CVE-2025-14282-05.patch | 46 +++
.../recipes-core/dropbear/dropbear_2025.88.bb | 5 +
.../expat/{expat_2.7.3.bb => expat_2.7.4.bb} | 2 +-
.../glib-2.0/files/CVE-2026-0988.patch | 58 +++
meta/recipes-core/glib-2.0/glib.inc | 1 +
meta/recipes-core/glibc/glibc-version.inc | 2 +-
meta/recipes-core/glibc/glibc_2.42.bb | 2 +-
.../libxml/libxml2/CVE-2026-0989.patch | 309 ++++++++++++++++
.../libxml/libxml2/CVE-2026-0990.patch | 76 ++++
.../libxml/libxml2/CVE-2026-0992-01.patch | 49 +++
.../libxml/libxml2/CVE-2026-0992-02.patch | 336 ++++++++++++++++++
.../libxml/libxml2/CVE-2026-0992-03.patch | 33 ++
meta/recipes-core/libxml/libxml2_2.14.6.bb | 5 +
meta/recipes-core/zlib/zlib_1.3.1.bb | 2 +
.../docbook-xml/docbook-xml-dtd4_4.5.bb | 10 +-
...-dirs.c-set_rootfs-was-not-checking-.patch | 46 +++
meta/recipes-devtools/dpkg/dpkg_1.22.21.bb | 1 +
.../go/{go-1.25.5.inc => go-1.25.6.inc} | 2 +-
...e_1.25.5.bb => go-binary-native_1.25.6.bb} | 6 +-
..._1.25.5.bb => go-cross-canadian_1.25.6.bb} | 0
...{go-cross_1.25.5.bb => go-cross_1.25.6.bb} | 0
...osssdk_1.25.5.bb => go-crosssdk_1.25.6.bb} | 0
...runtime_1.25.5.bb => go-runtime_1.25.6.bb} | 0
...ent-based-hash-generation-less-pedan.patch | 8 +-
...ng-cgo-on-386-call-C-sigaction-funct.patch | 4 +-
...d-go-make-GOROOT-precious-by-default.patch | 2 +-
.../go/{go_1.25.5.bb => go_1.25.6.bb} | 0
meta/recipes-devtools/pseudo/pseudo_git.bb | 4 +-
.../python3-urllib3/CVE-2026-21441.patch | 111 ++++++
.../python/python3-urllib3_2.5.0.bb | 1 +
.../{libpng_1.6.53.bb => libpng_1.6.54.bb} | 4 +-
.../libtheora/libtheora_1.2.0.bb | 2 +
.../gnutls/libtasn1/CVE-2025-13151.patch | 30 ++
.../recipes-support/gnutls/libtasn1_4.20.0.bb | 1 +
scripts/lib/resulttool/store.py | 9 +-
scripts/oe-git-archive | 2 +-
51 files changed, 2228 insertions(+), 31 deletions(-)
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-54770.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61661.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61662.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch
create mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-01.patch
create mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-02.patch
create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-01.patch
create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-02.patch
create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-03.patch
create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-04.patch
create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-05.patch
rename meta/recipes-core/expat/{expat_2.7.3.bb => expat_2.7.4.bb} (92%)
create mode 100644 meta/recipes-core/glib-2.0/files/CVE-2026-0988.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0989.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0990.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992-01.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992-02.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992-03.patch
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch
rename meta/recipes-devtools/go/{go-1.25.5.inc => go-1.25.6.inc} (91%)
rename meta/recipes-devtools/go/{go-binary-native_1.25.5.bb => go-binary-native_1.25.6.bb} (79%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.25.5.bb => go-cross-canadian_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.25.5.bb => go-cross_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.25.5.bb => go-crosssdk_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.25.5.bb => go-runtime_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go_1.25.5.bb => go_1.25.6.bb} (100%)
create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-21441.patch
rename meta/recipes-multimedia/libpng/{libpng_1.6.53.bb => libpng_1.6.54.bb} (94%)
create mode 100644 meta/recipes-support/gnutls/libtasn1/CVE-2025-13151.patchPATCH v2 1/22 oeqa/gitarchive: Fix git push URL parameter
From: Mathieu Dubois-Briand <[email protected]>
The gitarchive() function takes a push parameter than can be either a boolean or a string. But this parameter is then passed to expand_tag_strings(), which clearly expect it to be a string if it is defined. Split this in two arguments: a push boolean value and a push_remote optional string.
--- meta/lib/oeqa/selftest/cases/gitarchivetests.py | 4 ++-- meta/lib/oeqa/utils/gitarchive.py | 8 ++++---- scripts/lib/resulttool/store.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
meta/lib/oeqa/selftest/cases/gitarchivetests.py +2 -2
@@ -74,7 +74,7 @@ class GitArchiveTests(OESelftestTestCase): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - [], [], False, keywords, logger) + [], [], False, None, keywords, logger) self.assertTrue(tag_exists(git_obj, target_tag), msg=f"Tag {target_tag} has not been created") delete_fake_repository(path)
@@ -88,7 +88,7 @@ class GitArchiveTests(OESelftestTestCase): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - [], [], False, keywords, logger) + [], [], False, None, keywords, logger) self.assertTrue(tag_exists(git_obj, second_tag), msg=f"Second tag {second_tag} has not been created") delete_fake_repository(path)
meta/lib/oeqa/utils/gitarchive.py +4 -4
@@ -162,7 +162,7 @@ def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, msg_body = format_str(msg_body_pattern, keyws) return tag_name, msg_subj + '\n\n' + msg_body -def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_msg_body, branch_name, no_tag, tagname, tag_msg_subject, tag_msg_body, exclude, notes, push, keywords, log): +def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_msg_body, branch_name, no_tag, tagname, tag_msg_subject, tag_msg_body, exclude, notes, push, push_remote, keywords, log): if not os.path.isdir(data_dir): raise ArchiveError("Not a directory: {}".format(data_dir))
@@ -179,7 +179,7 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms tag_name, tag_msg = expand_tag_strings(data_repo, tagname, tag_msg_subject, tag_msg_body, - push, log, keywords) + push_remote, log, keywords) # Commit data commit = git_commit_data(data_repo, data_dir, branch_name,
@@ -195,10 +195,10 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms cmd = ['push', '--tags'] # If no remote is given we push with the default settings from # gitconfig - if push is not True: + if push_remote is not None: notes_refs = ['refs/notes/' + ref.format(branch_name=branch_name) for ref, _ in notes] - cmd.extend([push, branch_name] + notes_refs) + cmd.extend([push_remote, branch_name] + notes_refs) log.info("Pushing data to remote") data_repo.run_cmd(cmd)
scripts/lib/resulttool/store.py +1 -1
@@ -82,7 +82,7 @@ def store(args, logger): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - excludes, [], False, keywords, logger) + excludes, [], False, None, keywords, logger) if args.logfile_archive: logdir = args.logfile_archive + "/" + tagname
PATCH v2 2/22 oeqa/gitarchive: Push tag before copying log files
In reply to Yoann CongalFrom: Mathieu Dubois-Briand <[email protected]>
Resulttool creates a git tag in the yocto-testresults git and then copies log files to a newly created folder on the NFS share, whose name is controlled by the name of this git tag. As tags are unique, the folder name is also unique, preventing any clash between different builds.
Today, the tag is pushed from the calling script, so after the folder is copied. This can lead to some issues if for any reason the tag is not pushed. This might also lead to some race condition. Allow to push the tag before coying data, in order to prevent these issues, and add a warning if the calling script choose to not push the tag but still copy the log files on the NFS share.
Fixes [YOCTO #15696]
--- scripts/lib/resulttool/store.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
scripts/lib/resulttool/store.py +8 -1
@@ -82,9 +82,14 @@ def store(args, logger): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - excludes, [], False, None, keywords, logger) + excludes, [], args.push_tags, None, keywords, logger) if args.logfile_archive: + if not args.push_tags: + # As no tag was pushed, we can't guarantee there "tagname" + # is uniq and so we might have several builds trying to use + # the same "logdir" target. + logger.warning("Archiving log files but the %s tag was not pushed: this may result in target folder conflicts") logdir = args.logfile_archive + "/" + tagname shutil.copytree(tempdir, logdir) os.chmod(logdir, 0o755)
@@ -123,3 +128,5 @@ def register_commands(subparsers): help='only store data for the specified revision') parser_build.add_argument('-l', '--logfile-archive', default='', help='directory to separately archive log files along with a copy of the results') + parser_build.add_argument('-p', '--push-tags', action='store_true', + help='push created tags to remote git')
PATCH v2 3/22 scripts/oe-git-archive: Ensure new push parameter is specified
In reply to Yoann CongalFrom: Richard Purdie <[email protected]>
Fixes a regresion in "oeqa/gitarchive: Fix git push URL parameter" due to a missing parameter.
--- scripts/oe-git-archive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/oe-git-archive +1 -1
@@ -106,7 +106,7 @@ def main(argv=None): gitarchive.gitarchive(args.data_dir, args.git_dir, args.no_create, args.bare, args.commit_msg_subject.strip(), args.commit_msg_body, args.branch_name, args.no_tag, args.tag_name, args.tag_msg_subject, args.tag_msg_body, - args.exclude, args.notes, args.push, keywords, log) + args.exclude, args.notes, bool(args.push), args.push, keywords, log) except gitarchive.ArchiveError as err: log.error(str(err))
PATCH v2 4/22 grub: fix CVE-2025-54770 CVE-2025-61661 CVE-2025-61662 CVE-2025-61663 CVE-2025-61664
In reply to Yoann CongalFrom: Jiaying Song <[email protected]>
References:
https://nvd.nist.gov/vuln/detail/CVE-2025-54770
https://nvd.nist.gov/vuln/detail/CVE-2025-61661
https://nvd.nist.gov/vuln/detail/CVE-2025-61662
https://nvd.nist.gov/vuln/detail/CVE-2025-61663
https://nvd.nist.gov/vuln/detail/CVE-2025-61664
--- .../grub/files/CVE-2025-54770.patch | 41 +++++++++++ .../grub/files/CVE-2025-61661.patch | 40 +++++++++++ .../grub/files/CVE-2025-61662.patch | 72 +++++++++++++++++++ .../grub/files/CVE-2025-61663_61664.patch | 64 +++++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 4 ++ 5 files changed, 221 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-54770.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61661.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61662.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch
meta/recipes-bsp/grub/files/CVE-2025-54770.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 80e0e9b2558c40fb108ae7a869362566eb4c1ead Mon Sep 17 00:00:00 2001 +From: Thomas Frauendorfer | Miray Software <[email protected]> +Date: Fri, 9 May 2025 14:20:47 +0200 +Subject: [PATCH] net/net: Unregister net_set_vlan command on unload + +The commit 954c48b9c (net/net: Add net_set_vlan command) added command +net_set_vlan to the net module. Unfortunately the commit only added the +grub_register_command() call on module load but missed the +grub_unregister_command() on unload. Let's fix this. + +Fixes: CVE-2025-54770 +Fixes: 954c48b9c (net/net: Add net_set_vlan command) + +CVE: CVE-2025-54770 + +Upstream-Status: Backport +[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=10e58a14db20e17d1b6a39abe38df01fef98e29d] + +Reported-by: Thomas Frauendorfer | Miray Software <[email protected]> +Signed-off-by: Thomas Frauendorfer | Miray Software <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Jiaying Song <[email protected]> +--- + grub-core/net/net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 2b45c27d1..05f11be08 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -2080,6 +2080,7 @@ GRUB_MOD_FINI(net) + grub_unregister_command (cmd_deladdr); + grub_unregister_command (cmd_addroute); + grub_unregister_command (cmd_delroute); ++ grub_unregister_command (cmd_setvlan); + grub_unregister_command (cmd_lsroutes); + grub_unregister_command (cmd_lscards); + grub_unregister_command (cmd_lsaddr); +-- +2.34.1 +
meta/recipes-bsp/grub/files/CVE-2025-61661.patch new file +40 -0
@@ -0,0 +1,40 @@ +From c24e11d87f8ee8cefd615e0c30eb71ff6149ee50 Mon Sep 17 00:00:00 2001 +From: Jamie <[email protected]> +Date: Mon, 14 Jul 2025 09:52:59 +0100 +Subject: [PATCH 2/4] commands/usbtest: Use correct string length field + +An incorrect length field is used for buffer allocation. This leads to +grub_utf16_to_utf8() receiving an incorrect/different length and possibly +causing OOB write. This makes sure to use the correct length. + +Fixes: CVE-2025-61661 + +CVE: CVE-2025-61661 + +Upstream-Status: Backport +[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=549a9cc372fd0b96a4ccdfad0e12140476cc62a3] + +Reported-by: Jamie <[email protected]> +Signed-off-by: Jamie <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Jiaying Song <[email protected]> +--- + grub-core/commands/usbtest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/commands/usbtest.c b/grub-core/commands/usbtest.c +index 2c6d93fe6..8ef187a9a 100644 +--- a/grub-core/commands/usbtest.c ++++ b/grub-core/commands/usbtest.c +@@ -99,7 +99,7 @@ grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid, + return GRUB_USB_ERR_NONE; + } + +- *string = grub_malloc (descstr.length * 2 + 1); ++ *string = grub_malloc (descstrp->length * 2 + 1); + if (! *string) + { + grub_free (descstrp); +-- +2.34.1 +
meta/recipes-bsp/grub/files/CVE-2025-61662.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch new file +64 -0
64 lines not on this page · raw message
meta/recipes-bsp/grub/grub2.inc +4 -0
@@ -37,6 +37,10 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://CVE-2025-0677_CVE-2025-0684_CVE-2025-0685_CVE-2025-0686_CVE-2025-0689.patch \ file://CVE-2025-0678_CVE-2025-1125.patch \ file://CVE-2024-56738.patch \ + file://CVE-2025-54770.patch \ + file://CVE-2025-61661.patch \ + file://CVE-2025-61662.patch \ + file://CVE-2025-61663_61664.patch \ " # remove at next version upgrade or when output changes
PATCH v2 5/22 go: upgrade 1.25.5 -> 1.25.6
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Upgrade to latest 1.25.x release [1]:
$ git --no-pager log --oneline go1.25.5..go1.25.6 69801b25b9 (tag: go1.25.6) [release-branch.go1.25] go1.25.6 9d497df196 [release-branch.go1.25] archive/zip: reduce CPU usage in index construction afa9b66ac0 [release-branch.go1.25] net/url: add urlmaxqueryparams GODEBUG to limit the number of query parameters 2526187481 [release-branch.go1.25] cmd/go/internal/work: sanitize flags before invoking 'pkg-config' 082365aa55 [release-branch.go1.25] cmd/go: update VCS commands to use safer flag/argument syntax 4be38528a6 [release-branch.go1.25] crypto/tls: don't copy auto-rotated session ticket keys in Config.Clone 525dd85363 [release-branch.go1.25] crypto/tls: reject trailing messages after client/server hello ddcf27fc8c [release-branch.go1.25] Revert "errors: optimize errors.Join for single unwrappable errors" 14f50f6e3e [release-branch.go1.25] cmd/compile: handle propagating an out-of-range jump table index 4e531b2f14 [release-branch.go1.25] runtime: mark getfp as nosplit 6f07a57145 [release-branch.go1.25] runtime/race: set missing argument frame for ppc64x atomic And/Or wrappers ea603eea37 [release-branch.go1.25] os: allow direntries to have zero inodes on Linux 93f5d1c27e [release-branch.go1.25] os,internal/poll: don't call IsNonblock for consoles and Stdin d5bfdcbc47 [release-branch.go1.25] crypto/tls: use inner hello for earlyData when using QUIC and ECH
Fixes CVE-2025-61728, CVE-2025-61726, CVE-2025-68121, CVE-2025-61731,
CVE-2025-68119 and CVE-2025-61730.
Release information: [2]
[1] https://github.com/golang/go/compare/go1.25.5...go1.25.6
[2] https://groups.google.com/g/golang-announce/c/Vd2tYVM8eUc
---
meta/recipes-devtools/go/{go-1.25.5.inc => go-1.25.6.inc} | 2 +-
...binary-native_1.25.5.bb => go-binary-native_1.25.6.bb} | 6 +++---
...oss-canadian_1.25.5.bb => go-cross-canadian_1.25.6.bb} | 0
.../go/{go-cross_1.25.5.bb => go-cross_1.25.6.bb} | 0
.../go/{go-crosssdk_1.25.5.bb => go-crosssdk_1.25.6.bb} | 0
.../go/{go-runtime_1.25.5.bb => go-runtime_1.25.6.bb} | 0
...go-make-content-based-hash-generation-less-pedan.patch | 8 ++++----
...ime-when-using-cgo-on-386-call-C-sigaction-funct.patch | 4 ++--
.../go/0006-cmd-go-make-GOROOT-precious-by-default.patch | 2 +-
meta/recipes-devtools/go/{go_1.25.5.bb => go_1.25.6.bb} | 0
10 files changed, 11 insertions(+), 11 deletions(-)
rename meta/recipes-devtools/go/{go-1.25.5.inc => go-1.25.6.inc} (91%)
rename meta/recipes-devtools/go/{go-binary-native_1.25.5.bb => go-binary-native_1.25.6.bb} (79%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.25.5.bb => go-cross-canadian_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.25.5.bb => go-cross_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.25.5.bb => go-crosssdk_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.25.5.bb => go-runtime_1.25.6.bb} (100%)
rename meta/recipes-devtools/go/{go_1.25.5.bb => go_1.25.6.bb} (100%)meta/recipes-devtools/go/go-1.25.6.inc renamed from meta/recipes-devtools/go/go-1.25.5.inc +1 -1
@@ -18,4 +18,4 @@ SRC_URI += "\ file://0011-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch \ file://0001-runtime-when-using-cgo-on-386-call-C-sigaction-funct.patch \ " -SRC_URI[main.sha256sum] = "22a5fd0a91efcd28a1b0537106b9959b2804b61f59c3758b51e8e5429c1a954f" +SRC_URI[main.sha256sum] = "58cbf771e44d76de6f56d19e33b77d745a1e489340922875e46585b975c2b059"
meta/recipes-devtools/go/go-binary-native_1.25.6.bb renamed from meta/recipes-devtools/go/go-binary-native_1.25.5.bb +3 -3
@@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b" -SRC_URI[go_linux_arm64.sha256sum] = "b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9" -SRC_URI[go_linux_ppc64le.sha256sum] = "f0904b647b5b8561efc5d48bb59a34f2b7996afab83ccd41c93b1aeb2c0067e4" +SRC_URI[go_linux_amd64.sha256sum] = "f022b6aad78e362bcba9b0b94d09ad58c5a70c6ba3b7582905fababf5fe0181a" +SRC_URI[go_linux_arm64.sha256sum] = "738ef87d79c34272424ccdf83302b7b0300b8b096ed443896089306117943dd5" +SRC_URI[go_linux_ppc64le.sha256sum] = "bee02dbe034b12b839ae7807a85a61c13bee09ee38f2eeba2074bd26c0c0ab73" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.25.6.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.25.5.bb +0 -0
meta/recipes-devtools/go/go-cross_1.25.6.bb renamed from meta/recipes-devtools/go/go-cross_1.25.5.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.25.6.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.25.5.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.25.6.bb renamed from meta/recipes-devtools/go/go-runtime_1.25.5.bb +0 -0
meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +4 -4
@@ -109,7 +109,7 @@ index 7b073165d5..1f618be0bb 100644 } // Configuration specific to compiler toolchain. -@@ -2631,8 +2633,25 @@ func envList(key, def string) []string { +@@ -2639,8 +2641,25 @@ func envList(key, def string) []string { return args }
@@ -136,7 +136,7 @@ index 7b073165d5..1f618be0bb 100644 if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { return } -@@ -2648,6 +2667,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2656,6 +2675,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l if ldflags, err = buildFlags("LDFLAGS", DefaultCFlags, p.CgoLDFLAGS, checkLinkerFlags); err != nil { return }
@@ -150,7 +150,7 @@ index 7b073165d5..1f618be0bb 100644 return } -@@ -2665,7 +2691,7 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo +@@ -2673,7 +2699,7 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo p := a.Package sh := b.Shell(a)
@@ -159,7 +159,7 @@ index 7b073165d5..1f618be0bb 100644 if err != nil { return nil, nil, err } -@@ -3229,7 +3255,7 @@ func (b *Builder) swigOne(a *Action, file, objdir string, pcCFLAGS []string, cxx +@@ -3237,7 +3263,7 @@ func (b *Builder) swigOne(a *Action, file, objdir string, pcCFLAGS []string, cxx p := a.Package sh := b.Shell(a)
meta/recipes-devtools/go/go/0001-runtime-when-using-cgo-on-386-call-C-sigaction-funct.patch +2 -2
@@ -168,7 +168,7 @@ diff --git a/src/runtime/os_linux.go b/src/runtime/os_linux.go index c9d25a5be8..f9fe1b5f33 100644 --- a/src/runtime/os_linux.go +++ b/src/runtime/os_linux.go -@@ -486,7 +486,8 @@ func setsig(i uint32, fn uintptr) { +@@ -487,7 +487,8 @@ func setsig(i uint32, fn uintptr) { sigfillset(&sa.sa_mask) // Although Linux manpage says "sa_restorer element is obsolete and // should not be used". x86_64 kernel requires it. Only use it on
@@ -178,7 +178,7 @@ index c9d25a5be8..f9fe1b5f33 100644 if GOARCH == "386" || GOARCH == "amd64" { sa.sa_restorer = abi.FuncPCABI0(sigreturn__sigaction) } -@@ -562,6 +563,21 @@ func sysSigaction(sig uint32, new, old *sigactiont) { +@@ -563,6 +564,21 @@ func sysSigaction(sig uint32, new, old *sigactiont) { //go:noescape func rt_sigaction(sig uintptr, new, old *sigactiont, size uintptr) int32
meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch +1 -1
@@ -94,7 +94,7 @@ index 1f618be0bb..651fa64582 100644 if err := sh.Mkdir(a.Objdir); err != nil { return err } -@@ -1731,6 +1748,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) { +@@ -1739,6 +1756,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) { return err }
meta/recipes-devtools/go/go_1.25.6.bb renamed from meta/recipes-devtools/go/go_1.25.5.bb +0 -0
PATCH v2 6/22 zlib: ignore CVE-2026-22184
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
This is CVE for example tool contrib/untgz.
This is not compiled in Yocto zlib recipe.
This CVE has controversial CVSS3 score of 9.8.
--- meta/recipes-core/zlib/zlib_1.3.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-core/zlib/zlib_1.3.1.bb +2 -0
@@ -51,3 +51,5 @@ BBCLASSEXTEND = "native nativesdk" # Adding 'CVE_PRODUCT' to avoid false detection of CVEs CVE_PRODUCT = "zlib:zlib gnu:zlib" + +CVE_STATUS[CVE-2026-22184] = "not-applicable-config: vulnerable file is not compiled"
PATCH v2 7/22 python3-urllib3: patch CVE-2026-21441
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick patch mentioned in NVD report.
--- .../python3-urllib3/CVE-2026-21441.patch | 111 ++++++++++++++++++ .../python/python3-urllib3_2.5.0.bb | 1 + 2 files changed, 112 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-21441.patch
meta/recipes-devtools/python/python3-urllib3/CVE-2026-21441.patch new file +111 -0
@@ -0,0 +1,111 @@ +From 8864ac407bba8607950025e0979c4c69bc7abc7b Mon Sep 17 00:00:00 2001 +From: Illia Volochii <[email protected]> +Date: Wed, 7 Jan 2026 18:07:30 +0200 +Subject: [PATCH] Merge commit from fork + +* Stop decoding response content during redirects needlessly + +* Rename the new query parameter + +* Add a changelog entry + +CVE: CVE-2026-21441 +Upstream-Status: Backport [https://github.com/urllib3/urllib3/commit/8864ac407bba8607950025e0979c4c69bc7abc7b] +Signed-off-by: Peter Marko <[email protected]> +--- + CHANGES.rst | 13 +++++++++++++ + dummyserver/app.py | 8 +++++++- + src/urllib3/response.py | 6 +++++- + test/with_dummyserver/test_connectionpool.py | 19 +++++++++++++++++++ + 4 files changed, 44 insertions(+), 2 deletions(-) + +diff --git a/CHANGES.rst b/CHANGES.rst +index 2de9f016..4c0b9cea 100644 +--- a/CHANGES.rst ++++ b/CHANGES.rst +@@ -1,3 +1,16 @@ ++(TBD) ++================== ++ ++Bugfixes ++-------- ++ ++- Fixed a high-severity security issue where decompression-bomb safeguards of ++ the streaming API were bypassed when HTTP redirects were followed. ++ (`GHSA-38jv-5279-wg99 <https://github.com/urllib3/urllib3/security/advisories/GHSA-38jv-5279-wg99>`__) ++ ++TODO: add other entries. ++ ++ + 2.5.0 (2025-06-18) + ================== + +diff --git a/dummyserver/app.py b/dummyserver/app.py +index 0eeb93f7..5b82e932 100644 +--- a/dummyserver/app.py ++++ b/dummyserver/app.py +@@ -233,10 +233,16 @@ async def redirect() -> ResponseReturnValue: + values = await request.values + target = values.get("target", "/") + status = values.get("status", "303 See Other") ++ compressed = values.get("compressed") == "true" + status_code = status.split(" ")[0] + + headers = [("Location", target)] +- return await make_response("", status_code, headers) ++ if compressed: ++ headers.append(("Content-Encoding", "gzip")) ++ data = gzip.compress(b"foo") ++ else: ++ data = b"" ++ return await make_response(data, status_code, headers) + + + @hypercorn_app.route("/redirect_after") +diff --git a/src/urllib3/response.py b/src/urllib3/response.py +index f6266f1a..ff6d1f49 100644 +--- a/src/urllib3/response.py ++++ b/src/urllib3/response.py +@@ -687,7 +687,11 @@ class HTTPResponse(BaseHTTPResponse): + Unread data in the HTTPResponse connection blocks the connection from being released back to the pool. + """ + try: +- self.read() ++ self.read( ++ # Do not spend resources decoding the content unless ++ # decoding has already been initiated. ++ decode_content=self._has_decoded_content, ++ ) + except (HTTPError, OSError, BaseSSLError, HTTPException): + pass + +diff --git a/test/with_dummyserver/test_connectionpool.py b/test/with_dummyserver/test_connectionpool.py +index ce165e24..8d6107ae 100644 +--- a/test/with_dummyserver/test_connectionpool.py ++++ b/test/with_dummyserver/test_connectionpool.py +@@ -508,6 +508,25 @@ class TestConnectionPool(HypercornDummyServerTestCase): + assert r.status == 200 + assert r.data == b"Dummy server!" + ++ @mock.patch("urllib3.response.GzipDecoder.decompress") ++ def test_no_decoding_with_redirect_when_preload_disabled( ++ self, gzip_decompress: mock.MagicMock ++ ) -> None: ++ """ ++ Test that urllib3 does not attempt to decode a gzipped redirect ++ response when `preload_content` is set to `False`. ++ """ ++ with HTTPConnectionPool(self.host, self.port) as pool: ++ # Three requests are expected: two redirects and one final / 200 OK. ++ response = pool.request( ++ "GET", ++ "/redirect", ++ fields={"target": "/redirect?compressed=true", "compressed": "true"}, ++ preload_content=False, ++ ) ++ assert response.status == 200 ++ gzip_decompress.assert_not_called() ++ + def test_303_redirect_makes_request_lose_body(self) -> None: + with HTTPConnectionPool(self.host, self.port) as pool: + response = pool.request(
meta/recipes-devtools/python/python3-urllib3_2.5.0.bb +1 -0
@@ -9,6 +9,7 @@ inherit pypi python_hatchling SRC_URI += "\ file://CVE-2025-66418.patch \ + file://CVE-2026-21441.patch \ " DEPENDS += "python3-hatch-vcs-native"
PATCH v2 8/22 libtasn1: Fix CVE-2025-13151
In reply to Yoann CongalFrom: Hugo SIMELIERE <[email protected]>
Upstream-Status: Backport from https://gitlab.com/gnutls/libtasn1/-/commit/d276cc495a2a32b182c3c39851f1ba58f2d9f9b8
--- .../gnutls/libtasn1/CVE-2025-13151.patch | 30 +++++++++++++++++++ .../recipes-support/gnutls/libtasn1_4.20.0.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-support/gnutls/libtasn1/CVE-2025-13151.patch
meta/recipes-support/gnutls/libtasn1/CVE-2025-13151.patch new file +30 -0
@@ -0,0 +1,30 @@ +From ff7aa7ef2b9ba41df8f2d1e71b05bf2c2ad868dd Mon Sep 17 00:00:00 2001 +From: Vijay Sarvepalli <[email protected]> +Date: Mon, 22 Dec 2025 12:24:27 -0500 +Subject: [PATCH] Fix for CVE-2025-13151 Buffer overflow + +Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/-/commit/d276cc495a2a32b182c3c39851f1ba58f2d9f9b8] +CVE: CVE-2025-13151 + +Signed-off-by: Simon Josefsson <[email protected]> +Signed-off-by: Hugo SIMELIERE <[email protected]> +--- + lib/decoding.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/decoding.c b/lib/decoding.c +index 1e0fcb3..abcb49f 100644 +--- a/lib/decoding.c ++++ b/lib/decoding.c +@@ -1983,7 +1983,7 @@ int + asn1_expand_octet_string (asn1_node_const definitions, asn1_node *element, + const char *octetName, const char *objectName) + { +- char name[2 * ASN1_MAX_NAME_SIZE + 1], value[ASN1_MAX_NAME_SIZE]; ++ char name[2 * ASN1_MAX_NAME_SIZE + 2], value[ASN1_MAX_NAME_SIZE]; + int retCode = ASN1_SUCCESS, result; + int len, len2, len3; + asn1_node_const p2; +-- +2.47.1 +
meta/recipes-support/gnutls/libtasn1_4.20.0.bb +1 -0
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ + file://CVE-2025-13151.patch \ " DEPENDS = "bison-native"
PATCH v2 9/22 glibc: stable 2.42 branch updates
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
git log --oneline e34453cd6a8c592c325756ff3c7ac0afd3975cb4..912d89a766847649a3857985a3b5e6065c51bfd4 912d89a766 (HEAD -> release/2.42/master, origin/release/2.42/master) Switch currency symbol for the bg_BG locale to euro cbf39c26b2 posix: Reset wordexp_t fields with WRDE_REUSE (CVE-2025-15281 / BZ 33814)453e6b8dba resolv: Fix NSS DNS backend for getnetbyaddr (CVE-2026-0915)b0ec8fb689 memalign: reinstate alignment overflow check (CVE-2026-0861)f122d0b4d1 nptl: Optimize trylock for high cache contention workloads (BZ #33704)a1d3294a5b support: Exit on consistency check failure in resolv_response_add_name8dfb84ad4e support: Fix FILE * leak in check_for_unshare_hints in test-container2a0873aa81 sprof: fix -Wformat warnings on 32-bit hostsefdf4c0c87 sprof: check pread size and offset for overflowb11411fe2e posix: Fix invalid flags test for p{write,read}v28aaf4b732d ppc64le: Power 10 rawmemchr clobbers v20 (bug #33091)2dbf973fe0 ppc64le: Restore optimized strncmp for power106b2957cfe8 ppc64le: Restore optimized strcmp for power10828b8d23f3 AArch64: Fix and improve SVE pow(f) special cases710d7a2e83 AArch64: fix SVE tanpi(f) [BZ #33642]0c9430ed97 AArch64: Fix instability in AdvSIMD sinhec041b1f53 AArch64: Fix instability in AdvSIMD tan97297120ce AArch64: Optimise SVE scalar callbacks17c3eab387 aarch64: fix includes in SME testsde1fe81f47 aarch64: fix cfi directives around __libc_arm_za_disablebf499c2a49 x86: fix wmemset ifunc stray '!' (bug 33542)71874f167a aarch64: tests for SME256030b984 aarch64: clear ZA state of SME before clone and clone3 syscalls6de12fc9ad aarch64: define macro for calling __libc_arm_za_disableab8c1b5d62 x86: Detect Intel Nova Lake Processorbf48b17a28 x86: Detect Intel Wildcat Lake Processor18fd689cdc nptl: Fix MADV_GUARD_INSTALL logic for thread without guard page (BZ 33356)46b4e37c9e nss: Group merge does not react to ERANGE during merge (bug 33361)1166170d95 libio: Define AT_RENAME_* with the same tokens as Linux
Testing Results:
Before After Diff
PASS 6809 6815 +6 XPASS 4 4 0 FAIL 180 173 -7 XFAIL 16 16 0 UNSUPPORTED 129 129 0
Changes in failed testcases:
testcase-name before after malloc/tst-malloc_info FAIL PASS malloc/tst-malloc-too-large FAIL PASS malloc/tst-malloc-too-large-malloc-check FAIL PASS malloc/tst-malloc-too-large-malloc-hugetlb1 FAIL PASS malloc/tst-malloc-too-large-malloc-largetcache FAIL PASS malloc/tst-malloc-too-large-mcheck FAIL PASS nptl/tst-robustpi7 FAIL PASS posix/tst-wait3 FAIL PASS stdio-common/tst-read-offset PASS FAIL
--- meta/recipes-core/glibc/glibc-version.inc | 2 +- meta/recipes-core/glibc/glibc_2.42.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc-version.inc +1 -1
@@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.42/master" PV = "2.42+git" -SRCREV_glibc ?= "e34453cd6a8c592c325756ff3c7ac0afd3975cb4" +SRCREV_glibc ?= "912d89a766847649a3857985a3b5e6065c51bfd4" SRCREV_localedef ?= "cba02c503d7c853a38ccfb83c57e343ca5ecd7e5" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https"
meta/recipes-core/glibc/glibc_2.42.bb +1 -1
@@ -17,7 +17,7 @@ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, m easier access for another. 'ASLR bypass itself is not a vulnerability.'" CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" -CVE_STATUS_STABLE_BACKPORTS = "" +CVE_STATUS_STABLE_BACKPORTS = "CVE-2025-15281 CVE-2026-0861 CVE-2026-0915" CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" DEPENDS += "gperf-native bison-native"
PATCH v2 10/22 pseudo: Update to 1.9.3 release
In reply to Yoann CongalFrom: Richard Purdie <[email protected]>
Pulls in the following changes:
Makefile.in: Bump version to 1.9.3
configure: Minor code quality changes
pseudo: code quality scan - resolved various potential issues
makewrappers: improve error handling and robustness
Update COPYRIGHT files
ports/linux/pseudo_wrappers.c: Call the wrappers where possible ports/linux/pseudo_wrappers.c: Workaround compile error on Debian 11 ports/linux/pseudo_wrappers.c: Reorder the syscall operations ports/unix/guts/realpath.c: Fix indents
pseudo_util.c: Skip realpath like expansion for /proc on Linux test/test-proc-pipe.sh: Add test case for proc pipes ports/unix/guts/realpath.c: realpath fails if the resolved path doesn't exist
--- meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +2 -2
@@ -12,8 +12,8 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "125b020dd2bc46baa37a80784704e382732357b4" -PV = "1.9.2+git" +SRCREV = "750362cc7b9fa58dffccd95d919b435c6d8ac614" +PV = "1.9.3+git" # largefile and 64bit time_t support adds these macros via compiler flags globally # remove them for pseudo since pseudo intercepts some of the functions which will be
PATCH v2 11/22 dpkg: Fix ADMINDIR
In reply to Yoann CongalFrom: Mark Hatle <[email protected]>
dpkg has a hard coded path (from build time) for the ADMINDIR, for some reason the "set_root" function was using this hard coded value instead of the value from apt.conf or the environment.
Follow the example of db_dir.c and use the environment if set.
Adjust the matching oe package_manager functions to set the ADMINDIR, even though the apt.conf sets --admindir. Note it's unclear if the --admindir value that is set is reasonable or not.
--- meta/lib/oe/package_manager/deb/__init__.py | 4 ++ ...-dirs.c-set_rootfs-was-not-checking-.patch | 46 +++++++++++++++++++ meta/recipes-devtools/dpkg/dpkg_1.22.21.bb | 1 + 3 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch
meta/lib/oe/package_manager/deb/__init__.py +4 -0
@@ -213,6 +213,7 @@ class DpkgPM(OpkgDpkgPM): def update(self): os.environ['APT_CONFIG'] = self.apt_conf_file + os.environ['DPKG_ADMINDIR'] = '/var/lib/dpkg' self.deploy_dir_lock()
@@ -231,6 +232,7 @@ class DpkgPM(OpkgDpkgPM): return os.environ['APT_CONFIG'] = self.apt_conf_file + os.environ['DPKG_ADMINDIR'] = '/var/lib/dpkg' extra_args = "" if hard_depends_only:
@@ -282,6 +284,7 @@ class DpkgPM(OpkgDpkgPM): os.environ['IPKG_OFFLINE_ROOT'] = self.target_rootfs os.environ['OPKG_OFFLINE_ROOT'] = self.target_rootfs os.environ['INTERCEPT_DIR'] = self.intercepts_dir + os.environ['DPKG_ADMINDIR'] = '/var/lib/dpkg' if with_dependencies: os.environ['APT_CONFIG'] = self.apt_conf_file
@@ -424,6 +427,7 @@ class DpkgPM(OpkgDpkgPM): def fix_broken_dependencies(self): os.environ['APT_CONFIG'] = self.apt_conf_file + os.environ['DPKG_ADMINDIR'] = '/var/lib/dpkg' cmd = "%s %s --allow-unauthenticated -f install" % (self.apt_get_cmd, self.apt_args)
meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-devtools/dpkg/dpkg_1.22.21.bb +1 -0
@@ -14,6 +14,7 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.22. file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ file://0001-dpkg-Support-muslx32-build.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ + file://0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch \ " SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
PATCH v2 12/22 docbook-xml-dtd4: fix the fetching failure
In reply to Yoann CongalFrom: Khai Dang <[email protected]>
Updating SRC_URI, the old archive url is deprecated.
--- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +5 -5
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://docbook-4.5/docbookx.dtd;beginline=15;endline=30;md5= file://LICENSE-OASIS;md5=b9ee6208caa6e66c68dfad6f31d73f92" # Install the latest 4.5 DTDs, and the previous releases for backward compatibility. -SRC_URI = "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-4.1.2 \ - https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-4.2 \ - https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-4.3 \ - https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-4.4 \ - https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-${PV} \ +SRC_URI = "https://archive.docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-4.1.2 \ + https://archive.docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-4.2 \ + https://archive.docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-4.3 \ + https://archive.docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-4.4 \ + https://archive.docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-${PV} \ file://docbook-xml-update-catalog.xml.patch \ file://LICENSE-OASIS"
PATCH v2 13/22 dropbear: patch CVE-2025-14282
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick commits from PRs per [1].
[1] https://security-tracker.debian.org/tracker/CVE-2025-14282
--- .../dropbear/dropbear/CVE-2025-14282-01.patch | 280 +++++++++++++++++ .../dropbear/dropbear/CVE-2025-14282-02.patch | 97 ++++++ .../dropbear/dropbear/CVE-2025-14282-03.patch | 282 ++++++++++++++++++ .../dropbear/dropbear/CVE-2025-14282-04.patch | 72 +++++ .../dropbear/dropbear/CVE-2025-14282-05.patch | 46 +++ .../recipes-core/dropbear/dropbear_2025.88.bb | 5 + 6 files changed, 782 insertions(+) create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-01.patch create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-02.patch create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-03.patch create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-04.patch create mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2025-14282-05.patch
meta/recipes-core/dropbear/dropbear/CVE-2025-14282-01.patch new file +280 -0
@@ -0,0 +1,280 @@ +From e0251be2354e1a5c6eccfc2cf4b64243625dafcc Mon Sep 17 00:00:00 2001 +From: Matt Johnston <[email protected]> +Date: Tue, 9 Dec 2025 15:08:06 +0900 +Subject: [PATCH] Drop privileges after user authentication + +Instead of switching user privileges after forking to a shell, switch +to the user immediately upon successful authentication. + +This will require further commits to fix utmp and hostkey handling. + +The DROPBEAR_SVR_DROP_PRIVS configuration option controls this +behaviour. This should generally be enabled, but can be set to 0 for +incompatible platforms. In future it may become non-optional, those +platforms should be investigated. + +Most uses of DROPBEAR_SVR_MULTIUSER have been replaced by +!DROPBEAR_SVR_DROP_PRIVS. + +CVE: CVE-2025-14282 +Upstream-Status: Backport [https://github.com/mkj/dropbear/commit/e0251be2354e1a5c6eccfc2cf4b64243625dafcc] +Signed-off-by: Peter Marko <[email protected]> +--- + .github/workflows/build.yml | 2 ++ + src/auth.h | 1 + + src/default_options.h | 6 +++++ + src/svr-agentfwd.c | 14 ++++++++---- + src/svr-auth.c | 45 +++++++++++++++++++++++++++++++++++++ + src/svr-authpubkey.c | 6 +++-- + src/svr-chansession.c | 26 ++------------------- + src/sysoptions.h | 3 +++ + 8 files changed, 73 insertions(+), 30 deletions(-) + +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index 61e64a1..5c07d28 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -227,6 +227,8 @@ jobs: + echo "#define DROPBEAR_SVR_PASSWORD_AUTH 0" >> localoptions.h + # 1 second timeout is too short + sed -i "s/DEFAULT_IDLE_TIMEOUT 1/DEFAULT_IDLE_TIMEOUT 99/" localoptions.h ++ # DROPBEAR_SVR_DROP_PRIVS is on by default, turn it off ++ echo "#define DROPBEAR_SVR_DROP_PRIVS 0" >> localoptions.h + + - name: make + run: | +diff --git a/src/auth.h b/src/auth.h +index 0e854fb..096d23d 100644 +--- a/src/auth.h ++++ b/src/auth.h +@@ -40,6 +40,7 @@ void send_msg_userauth_banner(const buffer *msg); + void svr_auth_password(int valid_user); + void svr_auth_pubkey(int valid_user); + void svr_auth_pam(int valid_user); ++void svr_switch_user(void); + + #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT + int svr_pubkey_allows_agentfwd(void); +diff --git a/src/default_options.h b/src/default_options.h +index 9a0f064..705da74 100644 +--- a/src/default_options.h ++++ b/src/default_options.h +@@ -303,6 +303,12 @@ group1 in Dropbear server too */ + /* -T server option overrides */ + #define MAX_AUTH_TRIES 10 + ++/* Change server process to user privileges after authentication. */ ++#ifndef DROPBEAR_SVR_DROP_PRIVS ++/* Default is enabled. Should only be disabled if platforms are incompatible */ ++#define DROPBEAR_SVR_DROP_PRIVS DROPBEAR_SVR_MULTIUSER ++#endif ++ + /* Delay introduced before closing an unauthenticated session (seconds). + Disabled by default, can be set to say 30 seconds to reduce the speed + of password brute forcing. Note that there is a risk of denial of +diff --git a/src/svr-agentfwd.c b/src/svr-agentfwd.c +index a8941ea..5ee8c25 100644 +--- a/src/svr-agentfwd.c ++++ b/src/svr-agentfwd.c +@@ -151,7 +151,7 @@ void svr_agentcleanup(struct ChanSess * chansess) { + + if (chansess->agentfile != NULL && chansess->agentdir != NULL) { + +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + /* Remove the dir as the user. That way they can't cause problems except + * for themselves */ + uid = getuid(); +@@ -160,6 +160,9 @@ void svr_agentcleanup(struct ChanSess * chansess) { + (seteuid(ses.authstate.pw_uid)) < 0) { + dropbear_exit("Failed to set euid"); + } ++#else ++ (void)uid; ++ (void)gid; + #endif + + /* 2 for "/" and "\0" */ +@@ -172,7 +175,7 @@ void svr_agentcleanup(struct ChanSess * chansess) { + + rmdir(chansess->agentdir); + +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + if ((seteuid(uid)) < 0 || + (setegid(gid)) < 0) { + dropbear_exit("Failed to revert euid"); +@@ -219,7 +222,7 @@ static int bindagent(int fd, struct ChanSess * chansess) { + gid_t gid; + int ret = DROPBEAR_FAILURE; + +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + /* drop to user privs to make the dir/file */ + uid = getuid(); + gid = getgid(); +@@ -227,6 +230,9 @@ static int bindagent(int fd, struct ChanSess * chansess) { + (seteuid(ses.authstate.pw_uid)) < 0) { + dropbear_exit("Failed to set euid"); + } ++#else ++ (void)uid; ++ (void)gid; + #endif + + memset((void*)&addr, 0x0, sizeof(addr)); +@@ -267,7 +273,7 @@ bindsocket: + + + out: +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + if ((seteuid(uid)) < 0 || + (setegid(gid)) < 0) { + dropbear_exit("Failed to revert euid"); +diff --git a/src/svr-auth.c b/src/svr-auth.c +index 0a6b33a..46ba012 100644 +--- a/src/svr-auth.c ++++ b/src/svr-auth.c +@@ -457,12 +457,22 @@ void send_msg_userauth_success() { + /* authdone must be set after encrypt_packet() for + * delayed-zlib mode */ + ses.authstate.authdone = 1; ++ ++#if DROPBEAR_DROP_PRIVS ++ svr_switch_user(); ++#endif + ses.connect_time = 0; + + ++#if DROPBEAR_DROP_PRIVS ++ /* If running as the user, we can rely on the OS ++ * to limit allowed ports */ ++ ses.allowprivport = 1; ++#else + if (ses.authstate.pw_uid == 0) { + ses.allowprivport = 1; + } ++#endif + + /* Remove from the list of pre-auth sockets. Should be m_close(), since if + * we fail, we might end up leaking connection slots, and disallow new +@@ -472,3 +482,38 @@ void send_msg_userauth_success() { + TRACE(("leave send_msg_userauth_success")) + + } ++ ++/* Switch to the ses.authstate user. ++ * Fails if not running as root and the user differs. ++ * ++ * This may be called either after authentication, or ++ * after shell/command fork if DROPBEAR_SVR_DROP_PRIVS is unset. ++ */ ++void svr_switch_user(void) { ++ assert(ses.authstate.authdone); ++ ++ /* We can only change uid/gid as root ... */ ++ if (getuid() == 0) { ++ ++ if ((setgid(ses.authstate.pw_gid) < 0) || ++ (initgroups(ses.authstate.pw_name, ++ ses.authstate.pw_gid) < 0)) { ++ dropbear_exit("Error changing user group"); ++ } ++ if (setuid(ses.authstate.pw_uid) < 0) { ++ dropbear_exit("Error changing user"); ++ } ++ } else { ++ /* ... but if the daemon is the same uid as the requested uid, we don't ++ * need to */ ++ ++ /* XXX - there is a minor issue here, in that if there are multiple ++ * usernames with the same uid, but differing groups, then the ++ * differing groups won't be set (as with initgroups()). The solution ++ * is for the sysadmin not to give out the UID twice */ ++ if (getuid() != ses.authstate.pw_uid) { ++ dropbear_exit("Couldn't change user as non-root"); ++ } ++ } ++} ++ +diff --git a/src/svr-authpubkey.c b/src/svr-authpubkey.c +index 94ae728..e26b0ee 100644 +--- a/src/svr-authpubkey.c ++++ b/src/svr-authpubkey.c +@@ -462,12 +462,14 @@ static int checkpubkey(const char* keyalgo, unsigned int keyalgolen, + int ret = DROPBEAR_FAILURE; + buffer * line = NULL; + int line_num; ++#if !DROPBEAR_SVR_DROP_PRIVS + uid_t origuid; + gid_t origgid; ++#endif + + TRACE(("enter checkpubkey")) + +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + /* access the file as the authenticating user. */ + origuid = getuid(); + origgid = getgid(); +@@ -488,7 +490,7 @@ static int checkpubkey(const char* keyalgo, unsigned int keyalgolen, + TRACE(("checkpubkey: failed opening %s: %s", filename, strerror(errno))) + } + } +-#if DROPBEAR_SVR_MULTIUSER ++#if !DROPBEAR_SVR_DROP_PRIVS + if ((seteuid(origuid)) < 0 || + (setegid(origgid)) < 0) { + dropbear_exit("Failed to revert euid"); +diff --git a/src/svr-chansession.c b/src/svr-chansession.c +index 2ca6fc1..0a37fbf 100644 +--- a/src/svr-chansession.c ++++ b/src/svr-chansession.c +@@ -980,30 +980,8 @@ static void execchild(const void *user_data) { + #endif /* DEBUG_VALGRIND */ + } + +-#if DROPBEAR_SVR_MULTIUSER +- /* We can only change uid/gid as root ... */ +- if (getuid() == 0) { +- +- if ((setgid(ses.authstate.pw_gid) < 0) || +- (initgroups(ses.authstate.pw_name, +- ses.authstate.pw_gid) < 0)) { +- dropbear_exit("Error changing user group"); +- } +- if (setuid(ses.authstate.pw_uid) < 0) { +- dropbear_exit("Error changing user"); +- } +- } else { +- /* ... but if the daemon is the same uid as the requested uid, we don't +- * need to */ +- +- /* XXX - there is a minor issue here, in that if there are multiple +- * usernames with the same uid, but differing groups, then the +- * differing groups won't be set (as with initgroups()). The solution +- * is for the sysadmin not to give out the UID twice */ +- if (getuid() != ses.authstate.pw_uid) { +- dropbear_exit("Couldn't change user as non-root"); +- } +- } ++#if !DROPBEAR_SVR_DROP_PRIVS ++ svr_switch_user(); + #endif + + /* set env vars */ +diff --git a/src/sysoptions.h b/src/sysoptions.h +index cea9688..32b0a13 100644 +--- a/src/sysoptions.h ++++ b/src/sysoptions.h +@@ -443,6 +443,9 @@ + #define DROPBEAR_MULTI 0 + #endif + ++#if !DROPBEAR_SVR_MULTIUSER && DROPBEAR_SVR_DROP_PRIVS ++#error DROPBEAR_SVR_DROP_PRIVS needs DROPBEAR_SVR_MULTIUSER ++#endif + /* Fuzzing expects all key types to be enabled */ + #if DROPBEAR_FUZZ + #if defined(DROPBEAR_DSS)
meta/recipes-core/dropbear/dropbear/CVE-2025-14282-02.patch new file +97 -0
97 lines not on this page · raw message
meta/recipes-core/dropbear/dropbear/CVE-2025-14282-03.patch new file +282 -0
282 lines not on this page · raw message
meta/recipes-core/dropbear/dropbear/CVE-2025-14282-04.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-core/dropbear/dropbear/CVE-2025-14282-05.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-core/dropbear/dropbear_2025.88.bb +5 -0
@@ -22,6 +22,11 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ file://0001-Fix-proxycmd-without-netcat.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://CVE-2019-6111.patch \ + file://CVE-2025-14282-01.patch \ + file://CVE-2025-14282-02.patch \ + file://CVE-2025-14282-03.patch \ + file://CVE-2025-14282-04.patch \ + file://CVE-2025-14282-05.patch \ " SRC_URI[sha256sum] = "783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4"
PATCH v2 14/22 libtheora: set CVE_PRODUCT
In reply to Yoann CongalFrom: Ken Kurematsu <[email protected]>
In the NVD database, the product name of libtheora is theora. This was set to ensure that cve-check works correctly.
--- meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb +2 -0
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe UPSTREAM_CHECK_REGEX = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)" +CVE_PRODUCT = "theora" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-examples --disable-doc"
PATCH v2 15/22 libpng: upgrade 1.6.53 -> 1.6.54
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Handles CVE-2026-22695 and CVE-2026-22801.
License-Update: copyright years refreshed
Changelog:
Version 1.6.54 [January 12, 2026]
Fixed CVE-2026-22695 (medium severity):
Heap buffer over-read in `png_image_read_direct_scaled. (Reported and fixed by Petr Simecek.)
Fixed CVE-2026-22801 (medium severity):
Integer truncation causing heap buffer over-read in png_image_write_*.
Implemented various improvements in oss-fuzz.
(Contributed by Philippe Antoine.)
---
.../libpng/{libpng_1.6.53.bb => libpng_1.6.54.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/libpng/{libpng_1.6.53.bb => libpng_1.6.54.bb} (94%)meta/recipes-multimedia/libpng/libpng_1.6.54.bb renamed from meta/recipes-multimedia/libpng/libpng_1.6.53.bb +2 -2
@@ -5,7 +5,7 @@ library for use in applications that read, create, and manipulate PNG \ HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5516d77a3cf75f55a0d37254e3e65a20" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9dc350edbbbee660c7d9af79487168f2" DEPENDS = "zlib" LIBV = "16"
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4" +SRC_URI[sha256sum] = "01c9d8a303c941ec2c511c14312a3b1d36cedb41e2f5168ccdaa85d53b887805" MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
PATCH v2 16/22 glib-2.0: patch CVE-2026-0988
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick relevant commit from [2] linked from [1].
[1] https://gitlab.gnome.org/GNOME/glib/-/issues/3851
[2] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4944
--- .../glib-2.0/files/CVE-2026-0988.patch | 58 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib.inc | 1 + 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/files/CVE-2026-0988.patch
meta/recipes-core/glib-2.0/files/CVE-2026-0988.patch new file +58 -0
@@ -0,0 +1,58 @@ +From c5766cff61ffce0b8e787eae09908ac348338e5f Mon Sep 17 00:00:00 2001 +From: Philip Withnall <[email protected]> +Date: Thu, 18 Dec 2025 23:12:18 +0000 +Subject: [PATCH] gbufferedinputstream: Fix a potential integer overflow in + peek() + +If the caller provides `offset` and `count` arguments which overflow, +their sum will overflow and could lead to `memcpy()` reading out more +memory than expected. + +Spotted by Codean Labs. + +Signed-off-by: Philip Withnall <[email protected]> + +Fixes: #3851 + +CVE: CVE-2026-0988 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/c5766cff61ffce0b8e787eae09908ac348338e5f] +Signed-off-by: Peter Marko <[email protected]> +--- + gio/gbufferedinputstream.c | 2 +- + gio/tests/buffered-input-stream.c | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c +index 9e6bacc62..56d656be0 100644 +--- a/gio/gbufferedinputstream.c ++++ b/gio/gbufferedinputstream.c +@@ -590,7 +590,7 @@ g_buffered_input_stream_peek (GBufferedInputStream *stream, + + available = g_buffered_input_stream_get_available (stream); + +- if (offset > available) ++ if (offset > available || offset > G_MAXSIZE - count) + return 0; + + end = MIN (offset + count, available); +diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c +index a1af4eeff..2b2a0d9aa 100644 +--- a/gio/tests/buffered-input-stream.c ++++ b/gio/tests/buffered-input-stream.c +@@ -60,6 +60,16 @@ test_peek (void) + g_assert_cmpint (npeek, ==, 0); + g_free (buffer); + ++ buffer = g_new0 (char, 64); ++ npeek = g_buffered_input_stream_peek (G_BUFFERED_INPUT_STREAM (in), buffer, 8, 0); ++ g_assert_cmpint (npeek, ==, 0); ++ g_free (buffer); ++ ++ buffer = g_new0 (char, 64); ++ npeek = g_buffered_input_stream_peek (G_BUFFERED_INPUT_STREAM (in), buffer, 5, G_MAXSIZE); ++ g_assert_cmpint (npeek, ==, 0); ++ g_free (buffer); ++ + g_object_unref (in); + g_object_unref (base); + }
meta/recipes-core/glib-2.0/glib.inc +1 -0
@@ -231,6 +231,7 @@ SRC_URI += "\ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ file://skip-timeout.patch \ + file://CVE-2026-0988.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
PATCH v2 17/22 libxml2: patch CVE-2026-0989
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick patch from [1] linked from [2].
[1] https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/374
[2] https://gitlab.gnome.org/GNOME/libxml2/-/issues/998
--- .../libxml/libxml2/CVE-2026-0989.patch | 309 ++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.14.6.bb | 1 + 2 files changed, 310 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0989.patch
meta/recipes-core/libxml/libxml2/CVE-2026-0989.patch new file +309 -0
@@ -0,0 +1,309 @@ +From 19549c61590c1873468c53e0026a2fbffae428ef Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno <[email protected]> +Date: Fri, 10 Oct 2025 09:38:31 +0200 +Subject: [PATCH] Add RelaxNG include limit + +This patch adds a default xmlRelaxNGIncludeLimit of 1.000, and that +limit can be modified at runtime with the env variable +RNG_INCLUDE_LIMIT. + +Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/998 + +CVE: CVE-2026-0989 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef] +Signed-off-by: Peter Marko <[email protected]> +--- + include/libxml/relaxng.h | 4 ++ + relaxng.c | 63 ++++++++++++++++++++-- + runtest.c | 67 ++++++++++++++++++++++++ + test/relaxng/include/include-limit.rng | 4 ++ + test/relaxng/include/include-limit_1.rng | 4 ++ + test/relaxng/include/include-limit_2.rng | 4 ++ + test/relaxng/include/include-limit_3.rng | 8 +++ + 7 files changed, 150 insertions(+), 4 deletions(-) + create mode 100644 test/relaxng/include/include-limit.rng + create mode 100644 test/relaxng/include/include-limit_1.rng + create mode 100644 test/relaxng/include/include-limit_2.rng + create mode 100644 test/relaxng/include/include-limit_3.rng + +diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h +index eafc6604..099dacd8 100644 +--- a/include/libxml/relaxng.h ++++ b/include/libxml/relaxng.h +@@ -139,6 +139,10 @@ XMLPUBFUN int + xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt, + int flag); + ++XMLPUBFUN int ++ xmlRelaxParserSetIncLImit (xmlRelaxNGParserCtxt *ctxt, ++ int limit); ++ + XMLPUBFUN void + xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt); + XMLPUBFUN void +diff --git a/relaxng.c b/relaxng.c +index 1d74ba9f..c0e94a3c 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -18,6 +18,8 @@ + + #ifdef LIBXML_RELAXNG_ENABLED + ++#include <errno.h> ++#include <stdlib.h> + #include <string.h> + #include <stdio.h> + #include <stddef.h> +@@ -43,6 +45,12 @@ + static const xmlChar *xmlRelaxNGNs = (const xmlChar *) + "http://relaxng.org/ns/structure/1.0"; + ++/* ++ * Default include limit, this can be override with RNG_INCLUDE_LIMIT ++ * env variable ++ */ ++static const int _xmlRelaxNGIncludeLimit = 1000; ++ + #define IS_RELAXNG(node, typ) \ + ((node != NULL) && (node->ns != NULL) && \ + (node->type == XML_ELEMENT_NODE) && \ +@@ -219,6 +227,7 @@ struct _xmlRelaxNGParserCtxt { + int incNr; /* Depth of the include parsing stack */ + int incMax; /* Max depth of the parsing stack */ + xmlRelaxNGIncludePtr *incTab; /* array of incs */ ++ int incLimit; /* Include limit, to avoid stack-overflow on parse */ + + int idref; /* requires idref checking */ + +@@ -1405,6 +1414,23 @@ xmlRelaxParserSetFlag(xmlRelaxNGParserCtxtPtr ctxt, int flags) + return(0); + } + ++/** ++ * Semi private function used to set the include recursion limit to a ++ * parser context. Set to 0 to use the default value. ++ * ++ * @param ctxt a RelaxNG parser context ++ * @param limit the new include depth limit ++ * @returns 0 if success and -1 in case of error ++ */ ++int ++xmlRelaxParserSetIncLImit(xmlRelaxNGParserCtxt *ctxt, int limit) ++{ ++ if (ctxt == NULL) return(-1); ++ if (limit < 0) return(-1); ++ ctxt->incLimit = limit; ++ return(0); ++} ++ + /************************************************************************ + * * + * Document functions * +@@ -1462,7 +1488,7 @@ xmlRelaxReadMemory(xmlRelaxNGParserCtxtPtr ctxt, const char *buf, int size) { + * + * Pushes a new include on top of the include stack + * +- * Returns 0 in case of error, the index in the stack otherwise ++ * Returns -1 in case of error, the index in the stack otherwise + */ + static int + xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, +@@ -1476,9 +1502,15 @@ xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, + sizeof(ctxt->incTab[0])); + if (ctxt->incTab == NULL) { + xmlRngPErrMemory(ctxt); +- return (0); ++ return (-1); + } + } ++ if (ctxt->incNr >= ctxt->incLimit) { ++ xmlRngPErr(ctxt, (xmlNodePtr)value->doc, XML_RNGP_PARSE_ERROR, ++ "xmlRelaxNG: inclusion recursion limit reached\n", NULL, NULL); ++ return(-1); ++ } ++ + if (ctxt->incNr >= ctxt->incMax) { + ctxt->incMax *= 2; + ctxt->incTab = +@@ -1487,7 +1519,7 @@ xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, + sizeof(ctxt->incTab[0])); + if (ctxt->incTab == NULL) { + xmlRngPErrMemory(ctxt); +- return (0); ++ return (-1); + } + } + ctxt->incTab[ctxt->incNr] = value; +@@ -1657,7 +1689,9 @@ xmlRelaxNGLoadInclude(xmlRelaxNGParserCtxtPtr ctxt, const xmlChar * URL, + /* + * push it on the stack + */ +- xmlRelaxNGIncludePush(ctxt, ret); ++ if (xmlRelaxNGIncludePush(ctxt, ret) < 0) { ++ return (NULL); ++ } + + /* + * Some preprocessing of the document content, this include recursing +@@ -7381,11 +7415,32 @@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr ctxt) + xmlDocPtr doc; + xmlNodePtr root; + ++ const char *include_limit_env = getenv("RNG_INCLUDE_LIMIT"); ++ + xmlRelaxNGInitTypes(); + + if (ctxt == NULL) + return (NULL); + ++ if (ctxt->incLimit == 0) { ++ ctxt->incLimit = _xmlRelaxNGIncludeLimit; ++ if (include_limit_env != NULL) { ++ char *strEnd; ++ unsigned long val = 0; ++ errno = 0; ++ val = strtoul(include_limit_env, &strEnd, 10); ++ if (errno != 0 || *strEnd != 0 || val > INT_MAX) { ++ xmlRngPErr(ctxt, NULL, XML_RNGP_PARSE_ERROR, ++ "xmlRelaxNGParse: invalid RNG_INCLUDE_LIMIT %s\n", ++ (const xmlChar*)include_limit_env, ++ NULL); ++ return(NULL); ++ } ++ if (val) ++ ctxt->incLimit = val; ++ } ++ } ++ + /* + * First step is to parse the input document into an DOM/Infoset + */ +diff --git a/runtest.c b/runtest.c +index 49519aef..45109f0a 100644 +--- a/runtest.c ++++ b/runtest.c +@@ -3832,6 +3832,70 @@ rngTest(const char *filename, + return(ret); + } + ++/** ++ * Parse an RNG schemas with a custom RNG_INCLUDE_LIMIT ++ * ++ * @param filename the schemas file ++ * @param result the file with expected result ++ * @param err the file with error messages ++ * @returns 0 in case of success, an error code otherwise ++ */ ++static int ++rngIncludeTest(const char *filename, ++ const char *resul ATTRIBUTE_UNUSED, ++ const char *errr ATTRIBUTE_UNUSED, ++ int options ATTRIBUTE_UNUSED) { ++ xmlRelaxNGParserCtxtPtr ctxt; ++ xmlRelaxNGPtr schemas; ++ int ret = 0; ++ ++ /* first compile the schemas if possible */ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ ++ /* Should work */ ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas == NULL) { ++ testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n", ++ filename); ++ ret = -1; ++ goto done; ++ } ++ xmlRelaxNGFree(schemas); ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ /* Should fail */ ++ xmlRelaxParserSetIncLImit(ctxt, 2); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas != NULL) { ++ ret = -1; ++ xmlRelaxNGFree(schemas); ++ } ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ /* Should work */ ++ xmlRelaxParserSetIncLImit(ctxt, 3); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas == NULL) { ++ testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n", ++ filename); ++ ret = -1; ++ goto done; ++ } ++ xmlRelaxNGFree(schemas); ++ ++done: ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ return(ret); ++} ++ + #ifdef LIBXML_READER_ENABLED + /** + * rngStreamTest: +@@ -5299,6 +5363,9 @@ testDesc testDescriptions[] = { + { "Relax-NG regression tests" , + rngTest, "./test/relaxng/*.rng", NULL, NULL, NULL, + XML_PARSE_DTDATTR | XML_PARSE_NOENT }, ++ { "Relax-NG include limit tests" , ++ rngIncludeTest, "./test/relaxng/include/include-limit.rng", NULL, NULL, NULL, ++ 0 }, + #ifdef LIBXML_READER_ENABLED + { "Relax-NG streaming regression tests" , + rngStreamTest, "./test/relaxng/*.rng", NULL, NULL, NULL, +diff --git a/test/relaxng/include/include-limit.rng b/test/relaxng/include/include-limit.rng +new file mode 100644 +index 00000000..51f03942 +--- /dev/null ++++ b/test/relaxng/include/include-limit.rng +@@ -0,0 +1,4 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<grammar xmlns="http://relaxng.org/ns/structure/1.0"> ++ <include href="include-limit_1.rng"/> ++</grammar> +diff --git a/test/relaxng/include/include-limit_1.rng b/test/relaxng/include/include-limit_1.rng +new file mode 100644 +index 00000000..4672da38 +--- /dev/null ++++ b/test/relaxng/include/include-limit_1.rng +@@ -0,0 +1,4 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<grammar xmlns="http://relaxng.org/ns/structure/1.0"> ++ <include href="include-limit_2.rng"/> ++</grammar> +diff --git a/test/relaxng/include/include-limit_2.rng b/test/relaxng/include/include-limit_2.rng +new file mode 100644 +index 00000000..b35ecaa8 +--- /dev/null ++++ b/test/relaxng/include/include-limit_2.rng +@@ -0,0 +1,4 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<grammar xmlns="http://relaxng.org/ns/structure/1.0"> ++ <include href="include-limit_3.rng"/> ++</grammar> +diff --git a/test/relaxng/include/include-limit_3.rng b/test/relaxng/include/include-limit_3.rng +new file mode 100644 +index 00000000..86213c62 +--- /dev/null ++++ b/test/relaxng/include/include-limit_3.rng +@@ -0,0 +1,8 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<grammar xmlns="http://relaxng.org/ns/structure/1.0"> ++ <start> ++ <element name="root"> ++ <empty/> ++ </element> ++ </start> ++</grammar>
meta/recipes-core/libxml/libxml2_2.14.6.bb +1 -0
@@ -19,6 +19,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://install-tests.patch \ file://0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch \ file://CVE-2025-6021.patch \ + file://CVE-2026-0989.patch \ " SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"
PATCH v2 18/22 libxml2: patch CVE-2026-0990
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick patch which closed [1].
[1] https://gitlab.gnome.org/GNOME/libxml2/-/issues/1018
--- .../libxml/libxml2/CVE-2026-0990.patch | 76 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.14.6.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0990.patch
meta/recipes-core/libxml/libxml2/CVE-2026-0990.patch new file +76 -0
@@ -0,0 +1,76 @@ +From 1961208e958ca22f80a0b4e4c9d71cfa050aa982 Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno <[email protected]> +Date: Wed, 17 Dec 2025 15:24:08 +0100 +Subject: [PATCH] catalog: prevent inf recursion in xmlCatalogXMLResolveURI + +Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/1018 + +CVE: CVE-2026-0990 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/1961208e958ca22f80a0b4e4c9d71cfa050aa982] +Signed-off-by: Peter Marko <[email protected]> +--- + catalog.c | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + +diff --git a/catalog.c b/catalog.c +index 76c063a8..46b877e6 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -2047,12 +2047,21 @@ static xmlChar * + xmlCatalogListXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) { + xmlChar *ret = NULL; + xmlChar *urnID = NULL; ++ xmlCatalogEntryPtr cur = NULL; + + if (catal == NULL) + return(NULL); + if (URI == NULL) + return(NULL); + ++ if (catal->depth > MAX_CATAL_DEPTH) { ++ xmlCatalogErr(catal, NULL, XML_CATALOG_RECURSION, ++ "Detected recursion in catalog %s\n", ++ catal->name, NULL, NULL); ++ return(NULL); ++ } ++ catal->depth++; ++ + if (!xmlStrncmp(URI, BAD_CAST XML_URN_PUBID, sizeof(XML_URN_PUBID) - 1)) { + urnID = xmlCatalogUnWrapURN(URI); + if (xmlDebugCatalogs) { +@@ -2066,21 +2075,27 @@ xmlCatalogListXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) { + ret = xmlCatalogListXMLResolve(catal, urnID, NULL); + if (urnID != NULL) + xmlFree(urnID); ++ catal->depth--; + return(ret); + } +- while (catal != NULL) { +- if (catal->type == XML_CATA_CATALOG) { +- if (catal->children == NULL) { +- xmlFetchXMLCatalogFile(catal); ++ cur = catal; ++ while (cur != NULL) { ++ if (cur->type == XML_CATA_CATALOG) { ++ if (cur->children == NULL) { ++ xmlFetchXMLCatalogFile(cur); + } +- if (catal->children != NULL) { +- ret = xmlCatalogXMLResolveURI(catal->children, URI); +- if (ret != NULL) ++ if (cur->children != NULL) { ++ ret = xmlCatalogXMLResolveURI(cur->children, URI); ++ if (ret != NULL) { ++ catal->depth--; + return(ret); ++ } + } + } +- catal = catal->next; ++ cur = cur->next; + } ++ ++ catal->depth--; + return(ret); + } +
meta/recipes-core/libxml/libxml2_2.14.6.bb +1 -0
@@ -20,6 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch \ file://CVE-2025-6021.patch \ file://CVE-2026-0989.patch \ + file://CVE-2026-0990.patch \ " SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"
PATCH v2 19/22 libxml2: patch CVE-2026-0992
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick patch which closed [1].
[1] https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019
--- .../libxml/libxml2/CVE-2026-0992.patch | 49 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.14.6.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch
meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch new file +49 -0
@@ -0,0 +1,49 @@ +From f75abfcaa419a740a3191e56c60400f3ff18988d Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno <[email protected]> +Date: Fri, 19 Dec 2025 11:02:18 +0100 +Subject: [PATCH] catalog: Ignore repeated nextCatalog entries + +This patch makes the catalog parsing to ignore repeated entries of +nextCatalog with the same value. + +Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019 + +CVE: CVE-2026-0992 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/f75abfcaa419a740a3191e56c60400f3ff18988d] +Signed-off-by: Peter Marko <[email protected]> +--- + catalog.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/catalog.c b/catalog.c +index 46b877e6..fa6d77ca 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -1227,9 +1227,27 @@ xmlParseXMLCatalogNode(xmlNodePtr cur, xmlCatalogPrefer prefer, + BAD_CAST "delegateURI", BAD_CAST "uriStartString", + BAD_CAST "catalog", prefer, cgroup); + } else if (xmlStrEqual(cur->name, BAD_CAST "nextCatalog")) { ++ xmlCatalogEntryPtr prev = parent->children; ++ + entry = xmlParseXMLCatalogOneNode(cur, XML_CATA_NEXT_CATALOG, + BAD_CAST "nextCatalog", NULL, + BAD_CAST "catalog", prefer, cgroup); ++ /* Avoid duplication of nextCatalog */ ++ while (prev != NULL) { ++ if ((prev->type == XML_CATA_NEXT_CATALOG) && ++ (xmlStrEqual (prev->URL, entry->URL)) && ++ (xmlStrEqual (prev->value, entry->value)) && ++ (prev->prefer == entry->prefer) && ++ (prev->group == entry->group)) { ++ if (xmlDebugCatalogs) ++ xmlCatalogPrintDebug( ++ "Ignoring repeated nextCatalog %s\n", entry->URL); ++ xmlFreeCatalogEntry(entry, NULL); ++ entry = NULL; ++ break; ++ } ++ prev = prev->next; ++ } + } + if (entry != NULL) { + if (parent != NULL) {
meta/recipes-core/libxml/libxml2_2.14.6.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://CVE-2025-6021.patch \ file://CVE-2026-0989.patch \ file://CVE-2026-0990.patch \ + file://CVE-2026-0992.patch \ " SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"
PATCH v2 20/22 libxml2: add follow-up patch for CVE-2026-0992
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
References:
* https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019
* https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/377
---
...2026-0992.patch => CVE-2026-0992-01.patch} | 0
.../libxml/libxml2/CVE-2026-0992-02.patch | 336 ++++++++++++++++++
.../libxml/libxml2/CVE-2026-0992-03.patch | 33 ++
meta/recipes-core/libxml/libxml2_2.14.6.bb | 4 +-
4 files changed, 372 insertions(+), 1 deletion(-)
rename meta/recipes-core/libxml/libxml2/{CVE-2026-0992.patch => CVE-2026-0992-01.patch} (100%)
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992-02.patch
create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2026-0992-03.patchmeta/recipes-core/libxml/libxml2/CVE-2026-0992-01.patch renamed from meta/recipes-core/libxml/libxml2/CVE-2026-0992.patch +0 -0
meta/recipes-core/libxml/libxml2/CVE-2026-0992-02.patch new file +336 -0
336 lines not on this page · raw message
meta/recipes-core/libxml/libxml2/CVE-2026-0992-03.patch new file +33 -0
@@ -0,0 +1,33 @@ +From deed3b7873dff30b7f87f7f33154c9932a772522 Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno <[email protected]> +Date: Sun, 18 Jan 2026 19:47:11 +0100 +Subject: [PATCH] catalog: Do not check value for duplication nextCatalog + +The value field stores the path as it appears in the catalog definition, +the URL is built using xmlBuildURI that changes the relative paths to +absolute. + +This change fixes the issue of using relative path to the same catalog +in the same file. + +Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/1040 + +CVE: CVE-2026-0992 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/deed3b7873dff30b7f87f7f33154c9932a772522] +Signed-off-by: Peter Marko <[email protected]> +--- + catalog.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/catalog.c b/catalog.c +index eb889162..ba9ee7ae 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -1247,7 +1247,6 @@ xmlParseXMLCatalogNode(xmlNodePtr cur, xmlCatalogPrefer prefer, + while (prev != NULL) { + if ((prev->type == XML_CATA_NEXT_CATALOG) && + (xmlStrEqual (prev->URL, entry->URL)) && +- (xmlStrEqual (prev->value, entry->value)) && + (prev->prefer == entry->prefer) && + (prev->group == entry->group)) { + if (xmlDebugCatalogs)
meta/recipes-core/libxml/libxml2_2.14.6.bb +3 -1
@@ -21,7 +21,9 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://CVE-2025-6021.patch \ file://CVE-2026-0989.patch \ file://CVE-2026-0990.patch \ - file://CVE-2026-0992.patch \ + file://CVE-2026-0992-01.patch \ + file://CVE-2026-0992-02.patch \ + file://CVE-2026-0992-03.patch \ " SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"
PATCH v2 21/22 expat: upgrade 2.7.3 -> 2.7.4
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Changelog [1]:
Security fixes:
#1131 CVE-2026-24515 -- Function XML_ExternalEntityParserCreate
failed to copy the encoding handler data passed to XML_SetUnknownEncodingHandler from the parent to the new subparser. This can cause a NULL dereference (CWE-476) from external entities that declare use of an unknown encoding. The expected impact is denial of service. It takes use of both functions XML_ExternalEntityParserCreate and XML_SetUnknownEncodingHandler for an application to be vulnerable.
#1075 CVE-2026-25210 -- Add missing check for integer overflow
related to buffer size determination in function doContent
Bug fixes:
#1073 lib: Fix missing undoing of group size expansion in doProlog
failure cases
#1107 xmlwf: Fix a memory leak
#1104 WASI: Fix format specifiers for 32bit WASI SDK
Other changes:
#1105 lib: Fix strict aliasing
#1106 lib: Leverage feature "flexible array member" of C99 #1051 lib: Swap (size_t)(-1) for C99 equivalent SIZE_MAX #1109 lib|xmlwf: Return NULL instead of 0 for pointers #1068 lib|Windows: Clean up use of macro _MSC_EXTENSIONS with MSVC #1112 lib: Remove unused import
#1110 xmlwf: Warn about XXE in --help output (and man page)
#1102 #1103 WASI: Stop using getpid
... and additional docs/autotools/cmake/infrastructure changes
[1] https://github.com/libexpat/libexpat/blob/R_2_7_4/expat/Changes
---
meta/recipes-core/expat/{expat_2.7.3.bb => expat_2.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/expat/{expat_2.7.3.bb => expat_2.7.4.bb} (92%)meta/recipes-core/expat/expat_2.7.4.bb renamed from meta/recipes-core/expat/expat_2.7.3.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/" UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)" -SRC_URI[sha256sum] = "59c31441fec9a66205307749eccfee551055f2d792f329f18d97099e919a3b2f" +SRC_URI[sha256sum] = "e6af11b01e32e5ef64906a5cca8809eabc4beb7ff2f9a0e6aabbd42e825135d0" EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
PATCH v2 22/22 inetutils: patch CVE-2026-24061
In reply to Yoann CongalFrom: Peter Marko <[email protected]>
Pick patches per [1].
[1] https://security-tracker.debian.org/tracker/CVE-2026-24061
--- .../inetutils/CVE-2026-24061-01.patch | 38 +++++++++ .../inetutils/CVE-2026-24061-02.patch | 82 +++++++++++++++++++ .../inetutils/inetutils_2.6.bb | 2 + 3 files changed, 122 insertions(+) create mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-01.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-02.patch
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-01.patch new file +38 -0
@@ -0,0 +1,38 @@ +From fd702c02497b2f398e739e3119bed0b23dd7aa7b Mon Sep 17 00:00:00 2001 +From: Paul Eggert <[email protected]> +Date: Tue, 20 Jan 2026 01:10:36 -0800 +Subject: [PATCH] Fix injection bug with bogus user names + +Problem reported by Kyu Neushwaistein. +* telnetd/utility.c (_var_short_name): +Ignore user names that start with '-' or contain shell metacharacters. + +Signed-off-by: Simon Josefsson <[email protected]> + +CVE: CVE-2026-24061 +Upstream-Status: Backport [https://codeberg.org/inetutils/inetutils/commit/fd702c02497b2f398e739e3119bed0b23dd7aa7b] +Signed-off-by: Peter Marko <[email protected]> +--- + telnetd/utility.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/telnetd/utility.c b/telnetd/utility.c +index b486226e..c02cd0e6 100644 +--- a/telnetd/utility.c ++++ b/telnetd/utility.c +@@ -1733,7 +1733,14 @@ _var_short_name (struct line_expander *exp) + return user_name ? xstrdup (user_name) : NULL; + + case 'U': +- return getenv ("USER") ? xstrdup (getenv ("USER")) : xstrdup (""); ++ { ++ /* Ignore user names starting with '-' or containing shell ++ metachars, as they can cause trouble. */ ++ char const *u = getenv ("USER"); ++ return xstrdup ((u && *u != '-' ++ && !u[strcspn (u, "\t\n !\"#$&'()*;<=>?[\\^`{|}~")]) ++ ? u : ""); ++ } + + default: + exp->state = EXP_STATE_ERROR;
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-02.patch new file +82 -0
82 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils_2.6.bb +2 -0
@@ -18,6 +18,8 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ file://rsh.xinetd.inetutils \ file://telnet.xinetd.inetutils \ file://tftpd.xinetd.inetutils \ + file://CVE-2026-24061-01.patch \ + file://CVE-2026-24061-02.patch \ " inherit autotools gettext update-alternatives texinfo