Skip to contentSkip to conversation

Patch review

PATCH In review Fabien Thomas 2 participants 21 messages Nov 19

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for scarthgap and have comments back by end of day Monday, November 23.

Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/5152

The following changes since commit fc4316861becc9f0d41857b49f6438929ab4c291:

openssh: fix CVE-2026-123158 (aka "sshhole") (2026-11-10 10:47:42 +0100)

are available in the Git repository at:

https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-review
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-review

for you to fetch changes up to 4dec16113d0fdd009bc78d75bcab843454367c40:

aspell: upgrade 0.60.8.1 -> 0.60.8.2 (2026-11-19 09:16:30 +0100)

----------------------------------------------------------------

Adarsh Jagadish Kamini (3):
curl: fix CVE-2026-92389
curl: fix CVE-2026-92388
curl: fix CVE-2026-87864

Alexander Yurkov (1):
oeqa/selftest/recipetool: Update create_go test.

Darsh Kelaiya (2):
curl: set CVE_STATUS for CVE-2026-19931
curl: fix CVE-2026-18924

Fabien Thomas (1):
vim: Fix for CVE-2026-73076

João Marcos Costa (Schneider Electric) (1):
curl: fix CVE-2026-86409

Khem Raj (1):
aspell: Backport a fix to build with gcc-15/clang-19

Kris Gavvala (2):
nasm: fix CVE-2026-6067
nasm: fix CVE-2026-6068

Peter Marko (3):
popt: patch CVE-2026-18739
glibc: patch CVE-2026-86805 and CVE-2026-95818
gcc: patch CVE-2026-102010

Rohini Sangam (1):
bind: Security fix for CVE-2026-19667

Wang Mingyu (1):
aspell: upgrade 0.60.8.1 -> 0.60.8.2

Yoann Congal (2):
pseudo: Upgrade 1.9.11 -> 1.9.12+git
TEST-pseudo: test patches

Yogita Urade (1):
python3-urllib3: Fix CVE-2026-97687

 meta/lib/oeqa/selftest/cases/recipetool.py    | 212 +-------
 .../bind/bind/CVE-2026-19667-1.patch          | 139 +++++
 .../bind/bind/CVE-2026-19667-2.patch          | 355 +++++++++++++
 .../recipes-connectivity/bind/bind_9.18.49.bb |   2 +
 .../0049-CVE-2026-86805-CVE-2026-95818.patch  | 267 ++++++++++
 meta/recipes-core/glibc/glibc_2.39.bb         |   1 +
 meta/recipes-devtools/gcc/gcc-13.5.inc        |   1 +
 .../gcc/gcc/0028-CVE-2026-102010.patch        |  68 +++
 .../nasm/nasm/CVE-2026-6067.patch             |  36 ++
 .../nasm/nasm/CVE-2026-6068-1.patch           |  98 ++++
 .../nasm/nasm/CVE-2026-6068-2.patch           |  80 +++
 .../nasm/nasm/CVE-2026-6068-3.patch           |  51 ++
 meta/recipes-devtools/nasm/nasm_2.16.03.bb    |   4 +
 ...ree-tests-when-the-function-or-sysca.patch | 157 ++++++
 ...-t-generate-unused-_int-paths-with-n.patch |  59 +++
 ...ts-linux-Don-t-require-linux-mount.h.patch |  67 +++
 ...004-configure-Require-GCC-5-or-later.patch |  76 +++
 ...erialize-path-changes-across-clients.patch | 339 ++++++++++++
 ...ath-lock-in-create-and-metadata-wrap.patch | 182 +++++++
 ...ted-files-under-the-path-lock-before.patch | 248 +++++++++
 ...s-Add-a-parallel-create-rename-link-.patch |  87 ++++
 ...Add-information-specific-to-file-pro.patch | 216 ++++++++
 ...S.md-Add-to-assist-future-developers.patch | 113 ++++
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  16 +-
 .../python3-urllib3/CVE-2026-97687_p1.patch   | 285 +++++++++++
 .../python3-urllib3/CVE-2026-97687_p2.patch   | 482 ++++++++++++++++++
 .../python/python3-urllib3_2.2.2.bb           |   2 +
 ...{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} |   2 +-
 .../curl/curl/CVE-2026-18924.patch            |  56 ++
 .../curl/curl/CVE-2026-86409.patch            |  36 ++
 .../curl/curl/CVE-2026-87864.patch            |  52 ++
 .../curl/curl/CVE-2026-92388-1.patch          | 151 ++++++
 .../curl/curl/CVE-2026-92388-2.patch          |  30 ++
 .../curl/curl/CVE-2026-92389.patch            |  60 +++
 meta/recipes-support/curl/curl_8.7.1.bb       |   7 +
 .../popt/popt/CVE-2026-18739.patch            |  92 ++++
 meta/recipes-support/popt/popt_1.19.bb        |   2 +
 .../vim/files/CVE-2026-73076.patch            | 155 ++++++
 meta/recipes-support/vim/vim.inc              |   1 +
 39 files changed, 4087 insertions(+), 200 deletions(-)
 create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2026-19667-1.patch
 create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2026-19667-2.patch
 create mode 100644 meta/recipes-core/glibc/glibc/0049-CVE-2026-86805-CVE-2026-95818.patch
 create mode 100644 meta/recipes-devtools/gcc/gcc/0028-CVE-2026-102010.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6067.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-1.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-2.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-3.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0001-test-Skip-open_tree-tests-when-the-function-or-sysca.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0002-makewrappers-Don-t-generate-unused-_int-paths-with-n.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0003-ports-linux-Don-t-require-linux-mount.h.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0004-configure-Require-GCC-5-or-later.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0005-pseudo_client-serialize-path-changes-across-clients.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0006-ports-hold-the-path-lock-in-create-and-metadata-wrap.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0007-ports-check-created-files-under-the-path-lock-before.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0008-test-parallel-ops-Add-a-parallel-create-rename-link-.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0009-README.security-Add-information-specific-to-file-pro.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0010-AGENTS.md-Add-to-assist-future-developers.patch
 create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p1.patch
 create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p2.patch
 rename meta/recipes-support/aspell/{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} (93%)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-18924.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86409.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87864.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92388-1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92388-2.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92389.patch
 create mode 100644 meta/recipes-support/popt/popt/CVE-2026-18739.patch
 create mode 100644 meta/recipes-support/vim/files/CVE-2026-73076.patch
#1 lore raw

PATCH 1/19 nasm: fix CVE-2026-6067

From: Kris Gavvala <[email protected]>

When using obj output format, specifying more than 256 segments in the GROUP directive of the .asm file causes a heap-buffer-overflow.

This patch applies the upstream fix given by the commit in [1] to address the issue in [2].

[1] https://github.com/netwide-assembler/nasm/commit/8890d723d0aa9ed1a790e2ce1c55eee8dfa0cf94
[2] https://github.com/netwide-assembler/nasm/issues/203
[3] https://nvd.nist.gov/vuln/detail/cve-2026-6067

---
 .../nasm/nasm/CVE-2026-6067.patch             | 36 +++++++++++++++++++
 meta/recipes-devtools/nasm/nasm_2.16.03.bb    |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6067.patch
meta/recipes-devtools/nasm/nasm/CVE-2026-6067.patch new file +36 -0
new file mode 100644
index 0000000000..f637a688e3
@@ -0,0 +1,36 @@
+From 8bc3400afa0a3e46c890f8887d2f9bb5acc14024 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <[email protected]>
+Date: Mon, 29 Jun 2026 13:53:14 -0700
+Subject: [PATCH] outobj: fix buffer overflow when too many segments in a group
+
+The number of entries in a group was hard-coded, but not enforced.
+
+CVE: CVE-2026-6067
+Upstream-Status: Backport [https://github.com/netwide-assembler/nasm/commit/8890d723d0aa9ed1a790e2ce1c55eee8dfa0cf94]
+
+Reported-by: <[email protected]>
+Fixes: https://github.com/netwide-assembler/nasm/issues/203
+Signed-off-by: H. Peter Anvin (Intel) <[email protected]>
+Signed-off-by: Kris Gavvala <[email protected]>
+---
+ output/outobj.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/output/outobj.c b/output/outobj.c
+index fc336c194..ad4adb373 100644
+--- a/output/outobj.c
++++ b/output/outobj.c
+@@ -1641,6 +1641,10 @@ obj_directive(enum directive directive, char *value)
+                 /*
+                  * Now p contains a segment name. Find it.
+                  */
++		if (grp->nentries >= GROUP_MAX) {
++                    nasm_nonfatal("too many segments in a group");
++                    return DIRR_ERROR;
++                }
+                 for (seg = seghead; seg; seg = seg->next)
+                     if (!strcmp(seg->name, p))
+                         break;
+-- 
+2.43.0
+
meta/recipes-devtools/nasm/nasm_2.16.03.bb +1 -0
index 281f3940e7..729dfe8916 100644
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe"
 SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
            file://0001-stdlib-Add-strlcat.patch \
            file://0002-Add-debug-prefix-map-option.patch \
+           file://CVE-2026-6067.patch \
            "
 
 SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57"
#2 lore raw

PATCH 2/19 nasm: fix CVE-2026-6068

In reply to Fabien Thomas

From: Kris Gavvala <[email protected]>

- CVE-2026-6068-1.patch applies the upstream fix in [2], addressing the issue in [1].

- CVE-2026-6068-2.patch applies [3],
adding helper functions used in [2].

- CVE-2026-6068-3.patch applies [4],
which prevents the compilation warning:
assignment discards 'const' qualifier

[1] https://github.com/netwide-assembler/nasm/issues/222
[2] https://github.com/netwide-assembler/nasm/commit/7bc82e7daf4cceb6a8af7ad2876485c9b4b01a56
[3] https://github.com/netwide-assembler/nasm/commit/44245e4684be1fac6c2fb7ac67dce8a55a574956
[4] https://github.com/netwide-assembler/nasm/commit/7b4e77dae29156a283d31fe707939ce21bf3eb3e

---
 .../nasm/nasm/CVE-2026-6068-1.patch           | 98 +++++++++++++++++++
 .../nasm/nasm/CVE-2026-6068-2.patch           | 80 +++++++++++++++
 .../nasm/nasm/CVE-2026-6068-3.patch           | 51 ++++++++++
 meta/recipes-devtools/nasm/nasm_2.16.03.bb    |  3 +
 4 files changed, 232 insertions(+)
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-1.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-2.patch
 create mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2026-6068-3.patch
meta/recipes-devtools/nasm/nasm/CVE-2026-6068-1.patch new file +98 -0
new file mode 100644
index 0000000000..44f691610a
@@ -0,0 +1,98 @@
+From e3a3fb40d21edb638f8191465574aaaaaacb336d Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin (Intel)" <[email protected]>
+Date: Fri, 26 Jun 2026 17:27:47 -0700
+Subject: [PATCH 2/3] asm/nasm.c: fix use-after-free for -M* options in -@
+ files
+
+-M* options in response files would hold on to a pointer to the new
+value, but in response files that is not a persistent buffer. Make
+sure to make a copy instead.
+
+This uses the new nasm_str[dup]to() helpers.
+
+(Note that calling nasm_free() on a NULL pointer is guaranteed safe.)
+
+CVE: CVE-2026-6068
+Upstream-Status: Backport [https://github.com/netwide-assembler/nasm/commit/7bc82e7daf4cceb6a8af7ad2876485c9b4b01a56]
+
+Reported-by: <[email protected]>
+Fixes: https://github.com/netwide-assembler/nasm/issues/222
+Fixes: CVE-2026-6068
+Signed-off-by: H. Peter Anvin (Intel) <[email protected]>
+Signed-off-by: Kris Gavvala <[email protected]>
+---
+ asm/nasm.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/asm/nasm.c b/asm/nasm.c
+index 49fa00eb7..98bde83cb 100644
+--- a/asm/nasm.c
++++ b/asm/nasm.c
+@@ -121,8 +121,8 @@ static unsigned int operating_mode;
+ /* Dependency flags */
+ static bool depend_emit_phony = false;
+ static bool depend_missing_ok = false;
+-static const char *depend_target = NULL;
+-static const char *depend_file = NULL;
++static char *depend_target = NULL;
++static char *depend_file = NULL;
+ struct strlist *depend_list;
+ 
+ static bool want_usage;
+@@ -709,6 +709,8 @@ int main(int argc, char **argv)
+     stdscan_cleanup();
+     src_free();
+     strlist_free(&include_path);
++    nasm_free(depend_file);
++    nasm_free(depend_target);
+ 
+     return terminate_after_phase;
+ }
+@@ -750,7 +752,8 @@ static void copy_filename(const char **dst, const char *src, const char *what)
+ }
+ 
+ /*
+- * Convert a string to a POSIX make-safe form
++ * Convert a string to a POSIX make-safe form; returns a newly allocated
++ * string.
+  */
+ static char *quote_for_pmake(const char *str)
+ {
+@@ -830,7 +833,8 @@ static char *quote_for_pmake(const char *str)
+ }
+ 
+ /*
+- * Convert a string to a Watcom make-safe form
++ * Convert a string to a Watcom make-safe form; returns a newly allocated
++ * string.
+  */
+ static char *quote_for_wmake(const char *str)
+ {
+@@ -1188,20 +1192,20 @@ static bool process_arg(char *p, char *q, int pass)
+                 case 'D':
+                     operating_mode |= OP_DEPEND;
+                     if (q && (q[0] != '-' || q[1] == '\0')) {
+-                        depend_file = q;
++                        nasm_strdupto(&depend_file, q);
+                         advance = true;
+                     }
+                     break;
+                 case 'F':
+-                    depend_file = q;
++                    nasm_strdupto(&depend_file, q);
+                     advance = true;
+                     break;
+                 case 'T':
+-                    depend_target = q;
++                    nasm_strdupto(&depend_target, q);
+                     advance = true;
+                     break;
+                 case 'Q':
+-                    depend_target = quote_for_make(q);
++                    nasm_strto(&depend_target, quote_for_make(q));
+                     advance = true;
+                     break;
+                 case 'W':
+-- 
+2.43.0
+
meta/recipes-devtools/nasm/nasm/CVE-2026-6068-2.patch new file +80 -0

80 lines not on this page · raw message

meta/recipes-devtools/nasm/nasm/CVE-2026-6068-3.patch new file +51 -0

51 lines not on this page · raw message

meta/recipes-devtools/nasm/nasm_2.16.03.bb +3 -0
index 729dfe8916..d2608e3e20 100644
@@ -9,6 +9,9 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
            file://0001-stdlib-Add-strlcat.patch \
            file://0002-Add-debug-prefix-map-option.patch \
            file://CVE-2026-6067.patch \
+           file://CVE-2026-6068-1.patch \
+           file://CVE-2026-6068-2.patch \
+           file://CVE-2026-6068-3.patch \
            "
 
 SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57"
#3 lore raw

PATCH 3/19 vim: Fix for CVE-2026-73076

In reply to Fabien Thomas

Pick the patch from [1], also referenced in the NVD report [2].

[1] https://github.com/vim/vim/commit/581a2f3ac9c6f96a26324f6b2c8c11415fd0d452
[2] https://nvd.nist.gov/vuln/detail/CVE-2026-73076

[fatho: fix indentations to stay consistent with upstream]
---
 .../vim/files/CVE-2026-73076.patch            | 155 ++++++++++++++++++
 meta/recipes-support/vim/vim.inc              |   1 +
 2 files changed, 156 insertions(+)
 create mode 100644 meta/recipes-support/vim/files/CVE-2026-73076.patch
meta/recipes-support/vim/files/CVE-2026-73076.patch new file +155 -0
new file mode 100644
index 0000000000..87f2d4b62f
@@ -0,0 +1,155 @@
+From c74d28b907af0b1f1621f881f098374124bcd53d Mon Sep 17 00:00:00 2001
+From: Christian Brabandt <[email protected]>
+Date: Fri, 24 Jul 2026 17:43:51 +0200
+Subject: [PATCH] patch 9.2.0847: [security]: vimball: code execution via
+ .VimballRecord file
+
+Problem:  [security]: vimball: code execution via .VimballRecord file
+          (tdjackey)
+Solution: Forbid arbitrary commands, fix broken directory deletion code,
+          refactor code
+
+Github Security Advisory:
+https://github.com/vim/vim/security/advisories/GHSA-r22p-fhw4-84p2
+Signed-off-by: Christian Brabandt <[email protected]>
+
+Backport Changes:
+
+The .VimballRecord rejection is placed after the fenc/filecnt extraction
+because the earlier strange-filename check block present in upstream 9.2 does
+not exist in the 9.1.1683 vim sources.
+Omitted src/testdir/test_plugin_vimball.vim because the current vim source
+archive does not include it.
+
+CVE: CVE-2026-73076
+Upstream-Status: Backport [https://github.com/vim/vim/commit/581a2f3ac9c6f96a26324f6b2c8c11415fd0d452]
+Signed-off-by: Hitendra Prajapati <[email protected]>
+---
+ runtime/autoload/vimball.vim | 62 +++++++++++++++++++++---------------
+ 1 file changed, 37 insertions(+), 25 deletions(-)
+
+diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim
+index 6456984411..5791c7f44a 100644
+--- a/runtime/autoload/vimball.vim
++++ b/runtime/autoload/vimball.vim
+@@ -18,9 +18,9 @@ if &cp || exists("g:loaded_vimball")
+  finish
+ endif
+ let g:loaded_vimball = "v37"
+-if v:version < 702
++if v:version < 900
+  echohl WarningMsg
+- echo "***warning*** this version of vimball needs vim 7.2"
++ echo "***warning*** this version of vimball needs vim 9.0"
+  echohl Normal
+  finish
+ endif
+@@ -270,6 +270,13 @@ fun! vimball#Vimball(really,...)
+    let fenc    = substitute(getline(linenr+1),'^\d\+\s*\(\S\{-}\)$','\1','')
+    let filecnt = filecnt + 1
+ "   call Decho("fname<".fname."> fsize=".fsize." filecnt=".filecnt. " fenc=".fenc)
++   if fname =~? '\%(^\|/\)\.VimballRecord$'
++     echomsg "(Vimball) Forbidding .VimballRecord filename, aborting..."
++     exe "tabn ".curtabnr
++     bw! Vimball
++     call s:ChgDir(curdir)
++     return
++   endif
+ 
+    if a:really
+     echomsg "extracted <".fname.">: ".fsize." lines"
+@@ -309,7 +316,7 @@ fun! vimball#Vimball(really,...)
+       else
+        call mkdir(dirname)
+       endif
+-	  call s:RecordInVar(home,"rmdir('".dirname."')")
++	  call s:RecordDirInVar(dirname)
+      endif
+     endwhile
+    endif
+@@ -343,7 +350,7 @@ fun! vimball#Vimball(really,...)
+ 	 exe "silent w! ".fnameescape(fnamepath)
+ 	endif
+ 	echo "wrote ".fnameescape(fnamepath)
+-	call s:RecordInVar(home,"call delete('".fnamepath."')")
++	call s:RecordInVar(fnamepath)
+     endif
+ 
+     " return to tab with vimball
+@@ -464,11 +471,17 @@ fun! vimball#RmVimball(...)
+     let s:VBRstring= substitute(exestring,'call delete(','','g')
+     let s:VBRstring= substitute(s:VBRstring,"[')]",'','g')
+ "	call Decho("exe ".exestring)
+-	sil! keepalt keepjumps exe exestring
++	let nr_files= 0
++	for line in split(exestring, '|')
++		if line !~ '^call delete(''[^'']\{-}''\(,"d"\)\?)$'
++			echomsg "ignoring .VimballRecord entry: " line
++		else
++			sil! keepalt keepjumps exe line
++			let nr_files+= 1
++		endif
++	endfor
+ 	sil! keepalt keepjumps d
+-	let exestring= strlen(substitute(exestring,'call delete(.\{-})|\=',"D","g"))
+-"	call Decho("exestring<".exestring.">")
+-	echomsg "removed ".exestring." files"
++	echomsg "removed ".nr_files." files"
+    else
+     let s:VBRstring= ''
+ 	let curfile    = substitute(curfile,'\.vmb','','')
+@@ -622,23 +635,22 @@ fun! s:ChgDir(newdir)
+ endfun
+ 
+ " ---------------------------------------------------------------------
+-" s:RecordInVar: record a un-vimball command in the .VimballRecord file {{{2
+-fun! s:RecordInVar(home,cmd)
+-"  call Dfunc("RecordInVar(home<".a:home."> cmd<".a:cmd.">)")
+-  if a:cmd =~ '^rmdir'
+-"   if !exists("s:recorddir")
+-"    let s:recorddir= substitute(a:cmd,'^rmdir',"call s:Rmdir",'')
+-"   else
+-"    let s:recorddir= s:recorddir."|".substitute(a:cmd,'^rmdir',"call s:Rmdir",'')
+-"   endif
+-  elseif !exists("s:recordfile")
+-   let s:recordfile= a:cmd
+-  else
+-   let s:recordfile= s:recordfile."|".a:cmd
++" s:RecordInVar: record a un-vimball file deletion in the .VimballRecord file {{{2
++fun! s:RecordInVar(file)
++  if !exists("s:recordfile")
++    let s:recordfile=[]
+   endif
+-"  call Dret("RecordInVar : s:recordfile<".(exists("s:recordfile")? s:recordfile : "")."> s:recorddir<".(exists("s:recorddir")? s:recorddir : "").">")
++  call add(s:recordfile, $'call delete({string(a:file)})')
+ endfun
+ 
++" s:RecordDirInVar: record a un-vimball dir deletion in the .VimballRecord file {{{2
++fun! s:RecordDirInVar(dir)
++  if !exists("s:recorddir")
++    let s:recorddir = []
++  endif
++  call add(s:recorddir, $'call delete({string(a:dir)},"d")')
++  endfun
++
+ " ---------------------------------------------------------------------
+ " s:RecordInFile: {{{2
+ fun! s:RecordInFile(home)
+@@ -660,11 +672,11 @@ fun! s:RecordInFile(home)
+    setlocal ma
+    $
+    if exists("s:recordfile") && exists("s:recorddir")
+-   	let cmd= cmd.s:recordfile."|".s:recorddir
++   	let cmd= cmd.join(s:recordfile, '|')."|".join(s:recorddir, '|')
+    elseif exists("s:recorddir")
+-   	let cmd= cmd.s:recorddir
++   	let cmd= cmd.join(s:recorddir, '|')
+    elseif exists("s:recordfile")
+-   	let cmd= cmd.s:recordfile
++   	let cmd= cmd.join(s:recordfile, '|')
+    else
+ "    call Dret("s:RecordInFile : neither recordfile nor recorddir exist")
+ 	return
+-- 
+2.50.1
+
meta/recipes-support/vim/vim.inc +1 -0
index f84d2a9688..3a8b67085a 100644
@@ -58,6 +58,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://CVE-2026-73074.patch \
            file://CVE-2026-73077.patch \
            file://CVE-2026-73078.patch \
+           file://CVE-2026-73076.patch \
            "
 
 PV .= ".1683"
#4 lore raw

PATCH 4/19 bind: Security fix for CVE-2026-19667

In reply to Fabien Thomas

From: Rohini Sangam <[email protected]>

Pick patch from [1] and [2] also mentioned at Debian tracker in [3]

[1] https://github.com/isc-projects/bind9/commit/c4203fb70e3985452afddeadb7075aa91ae05d7d
[2] https://github.com/isc-projects/bind9/commit/993d10fe15adbac485d399f1e4144b55ed226ecf
[3] https://security-tracker.debian.org/tracker/CVE-2026-19667

---
 .../bind/bind/CVE-2026-19667-1.patch          | 139 +++++++
 .../bind/bind/CVE-2026-19667-2.patch          | 355 ++++++++++++++++++
 .../recipes-connectivity/bind/bind_9.18.49.bb |   2 +
 3 files changed, 496 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2026-19667-1.patch
 create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2026-19667-2.patch
meta/recipes-connectivity/bind/bind/CVE-2026-19667-1.patch new file +139 -0
new file mode 100644
index 0000000000..5c52e42034
@@ -0,0 +1,139 @@
+From e5c7129b2d312d14759aa8b4a146f78a6a60020e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <[email protected]>
+Date: Thu, 6 Aug 2026 17:15:26 +0200
+Subject: [PATCH 1/2] Reject negative cache records that do not fit in a
+ dns_rdata_t
+
+dns_ncache_add() assembles each negative cache record in a 64 KiB stack
+buffer and then stores its size in dns_rdata_t.length, which is 16 bits
+wide.  A record that fills the buffer exactly is recorded as being zero
+bytes long, which is small enough to satisfy the size checks in
+dns_rdataslab_fromrdataset() that would otherwise have rejected it.  The
+truncated record is committed to the cache, and every reader of it then
+fails an assertion.
+
+A response whose authority section repeats one SOA record, with MNAME
+and RNAME compressed against a long QNAME, expands to exactly that size,
+so check the length where the record is produced rather than relying on
+the slab code to notice.  Every other way of building a dns_rdata_t
+already refuses anything longer than DNS_RDATA_MAXLENGTH.
+
+While here, refuse a singleton RRset with more than one record and a
+second SOA RRset as DNS_R_TOOMANYRECORDS, which is now also what more
+than DNS_NCACHE_RDATA records reports instead of ISC_R_NOSPACE.  The
+message parser and the resolver already reject duplicate singletons
+and a second SOA on their own, but dns_ncache_add() should not depend
+on its callers for that.
+
+Co-authored-by: Mark Andrews <[email protected]>
+(cherry picked from commit 8b20ed0a647cd1e9efc3bf442fc5d898f6a4de57)
+
+CVE: CVE-2026-19667
+Upstream-Status: Backport [https://github.com/isc-projects/bind9/commit/c4203fb70e3985452afddeadb7075aa91ae05d7d]
+
+Signed-off-by: Rohini Sangam <[email protected]>
+---
+ lib/dns/ncache.c | 48 +++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 45 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
+index c99c266..bab42bf 100644
+--- a/lib/dns/ncache.c
++++ b/lib/dns/ncache.c
+@@ -63,14 +63,30 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) {
+ 		return ISC_R_NOSPACE;
+ 	}
+ 	count = dns_rdataset_count(rdataset);
++
++	/*
++	 * Reject duplicate singleton records.
++	 */
++	if (dns_rdatatype_issingleton(rdataset->type) && count != 1) {
++		return DNS_R_TOOMANYRECORDS;
++	}
++
+ 	INSIST(count <= 65535);
+ 	isc_buffer_putuint16(buffer, (uint16_t)count);
+ 
++	if (ar.length < 2 + count * 2) {
++		/*
++		 * The count took 2 bytes and each rdata needs at least 2
++		 * more for its length.  Bail early if that cannot fit.
++		 */
++		return ISC_R_NOSPACE;
++	}
++
+ 	result = dns_rdataset_first(rdataset);
+ 	while (result == ISC_R_SUCCESS) {
+ 		dns_rdataset_current(rdataset, &rdata);
+ 		dns_rdata_toregion(&rdata, &r);
+-		INSIST(r.length <= 65535);
++		INSIST(r.length <= DNS_RDATA_MAXLENGTH);
+ 		isc_buffer_availableregion(buffer, &ar);
+ 		if (ar.length < 2) {
+ 			return ISC_R_NOSPACE;
+@@ -79,6 +95,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) {
+ 		 * Copy the rdata length to the buffer.
+ 		 */
+ 		isc_buffer_putuint16(buffer, (uint16_t)r.length);
++
+ 		/*
+ 		 * Copy the rdata to the buffer.
+ 		 */
+@@ -129,8 +146,9 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
+ 	dns_rdata_t rdata[DNS_NCACHE_RDATA];
+ 	dns_rdataset_t ncrdataset;
+ 	dns_rdatalist_t ncrdatalist;
+-	unsigned char data[65536];
++	unsigned char data[UINT16_MAX];
+ 	unsigned int next = 0;
++	bool seen_soa = false;
+ 
+ 	/*
+ 	 * Convert the authority data from 'message' into a negative cache
+@@ -177,6 +195,20 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
+ 					continue;
+ 				}
+ 				type = rdataset->type;
++
++				/*
++				 * A negative response carries one SOA
++				 * RRset.  The resolver rejects a second
++				 * one before it gets here; don't rely on
++				 * that.
++				 */
++				if (type == dns_rdatatype_soa) {
++					if (seen_soa) {
++						return DNS_R_TOOMANYRECORDS;
++					}
++					seen_soa = true;
++				}
++
+ 				if (type == dns_rdatatype_rrsig) {
+ 					type = rdataset->covers;
+ 				}
+@@ -224,10 +256,20 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
+ 					}
+ 
+ 					if (next >= DNS_NCACHE_RDATA) {
+-						return ISC_R_NOSPACE;
++						return DNS_R_TOOMANYRECORDS;
+ 					}
+ 					dns_rdata_init(&rdata[next]);
+ 					isc_buffer_remainingregion(&buffer, &r);
++					/*
++					 * dns_rdata_t.length is 16 bits wide,
++					 * so a longer record would be silently
++					 * truncated here and would then pass
++					 * the size checks in
++					 * dns_rdataslab_fromrdataset().
++					 */
++					if (r.length > DNS_RDATA_MAXLENGTH) {
++						return ISC_R_NOSPACE;
++					}
+ 					rdata[next].data = r.base;
+ 					rdata[next].length = r.length;
+ 					rdata[next].rdclass =
+-- 
+2.44.4
+
meta/recipes-connectivity/bind/bind/CVE-2026-19667-2.patch new file +355 -0

355 lines not on this page · raw message

meta/recipes-connectivity/bind/bind_9.18.49.bb +2 -0
index 723a09e739..fef00e363f 100644
@@ -18,6 +18,8 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
            file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
            file://0001-avoid-start-failure-with-bind-user.patch \
+           file://CVE-2026-19667-1.patch \
+           file://CVE-2026-19667-2.patch \
            "
 
 SRC_URI[sha256sum] = "c43ce4548ebed788cd9df63658a7de105ceafba43fcd63fa352b1093e525cd24"
#5 lore raw

PATCH 5/19 oeqa/selftest/recipetool: Update create_go test.

In reply to Fabien Thomas

From: Alexander Yurkov <[email protected]>

Adjust test_recipetool_go_create test to a smaller repository. Combine test_recipetool_go_create and test_recipetool_go_replace_modules tests into test_recipetool_go_create, the new test performs both tests.

(cherry picked from commit d1256f8ff4a94d4f32b2b9ca855359dd2d691beb)

Backport to fix test_recipetool_create_go failing on the autobuilder:
google.golang.org/protobuf's go-import meta now points to github.com/protocolbuffers/protobuf-go instead of go.googlesource.com/protobuf, so the hardcoded expectation no longer matches. Upstream switched the test to a dedicated small repository, which avoids this dependency entirely.

Seen on https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/5235

---
 meta/lib/oeqa/selftest/cases/recipetool.py | 212 ++-------------------
 1 file changed, 16 insertions(+), 196 deletions(-)
meta/lib/oeqa/selftest/cases/recipetool.py +16 -196
index 8c54e65ad6..5bde8903f3 100644
@@ -760,13 +760,13 @@ class RecipetoolCreateTests(RecipetoolBase):
         temprecipe = os.path.join(self.tempdir, 'recipe')
         os.makedirs(temprecipe)
 
-        recipefile = os.path.join(temprecipe, 'edgex-go_git.bb')
-        deps_require_file = os.path.join(temprecipe, 'edgex-go', 'edgex-go-modules.inc')
-        lics_require_file = os.path.join(temprecipe, 'edgex-go', 'edgex-go-licenses.inc')
-        modules_txt_file = os.path.join(temprecipe, 'edgex-go', 'modules.txt')
+        recipefile = os.path.join(temprecipe, 'recipetool-go-test_git.bb')
+        deps_require_file = os.path.join(temprecipe, 'recipetool-go-test', 'recipetool-go-test-modules.inc')
+        lics_require_file = os.path.join(temprecipe, 'recipetool-go-test', 'recipetool-go-test-licenses.inc')
+        modules_txt_file = os.path.join(temprecipe, 'recipetool-go-test', 'modules.txt')
 
-        srcuri = 'https://github.com/edgexfoundry/edgex-go.git'
-        srcrev = "v3.0.0"
+        srcuri = 'https://git.yoctoproject.org/recipetool-go-test.git'
+        srcrev = "c3e213c01b6c1406b430df03ef0d1ae77de5d2f7"
         srcbranch = "main"
 
         result = runCmd('recipetool create -o %s %s -S %s -B %s' % (temprecipe, srcuri, srcrev, srcbranch))
@@ -775,207 +775,27 @@ class RecipetoolCreateTests(RecipetoolBase):
         inherits = ['go-vendor']
 
         checkvars = {}
-        checkvars['GO_IMPORT'] = "github.com/edgexfoundry/edgex-go"
+        checkvars['GO_IMPORT'] = "git.yoctoproject.org/recipetool-go-test"
         checkvars['SRC_URI'] = {'git://${GO_IMPORT};destsuffix=git/src/${GO_IMPORT};nobranch=1;name=${BPN};protocol=https',
                                 'file://modules.txt'}
-        checkvars['LIC_FILES_CHKSUM'] = {'file://src/${GO_IMPORT}/LICENSE;md5=8f8bc924cf73f6a32381e5fd4c58d603'}
+        checkvars['LIC_FILES_CHKSUM'] = {
+            'file://src/${GO_IMPORT}/LICENSE;md5=4e3933dd47afbf115e484d11385fb3bd',
+            'file://src/${GO_IMPORT}/is/LICENSE;md5=62beaee5a116dd1e80161667b1df39ab'
+        }
 
-        self.assertTrue(os.path.isfile(recipefile))
         self._test_recipe_contents(recipefile, checkvars, inherits)
+        self.assertNotIn('Traceback', result.output)
 
         checkvars = {}
         checkvars['VENDORED_LIC_FILES_CHKSUM'] = set(
-                 ['file://src/${GO_IMPORT}/vendor/github.com/Microsoft/go-winio/LICENSE;md5=69205ff73858f2c22b2ca135b557e8ef',
-                 'file://src/${GO_IMPORT}/vendor/github.com/armon/go-metrics/LICENSE;md5=d2d77030c0183e3d1e66d26dc1f243be',
-                 'file://src/${GO_IMPORT}/vendor/github.com/cenkalti/backoff/LICENSE;md5=1571d94433e3f3aa05267efd4dbea68b',
-                 'file://src/${GO_IMPORT}/vendor/github.com/davecgh/go-spew/LICENSE;md5=c06795ed54b2a35ebeeb543cd3a73e56',
-                 'file://src/${GO_IMPORT}/vendor/github.com/eclipse/paho.mqtt.golang/LICENSE;md5=dcdb33474b60c38efd27356d8f2edec7',
-                 'file://src/${GO_IMPORT}/vendor/github.com/eclipse/paho.mqtt.golang/edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-bootstrap/v3/LICENSE;md5=0d6dae39976133b2851fba4c1e1275ff',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-configuration/v3/LICENSE;md5=0d6dae39976133b2851fba4c1e1275ff',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-core-contracts/v3/LICENSE;md5=0d6dae39976133b2851fba4c1e1275ff',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-messaging/v3/LICENSE;md5=0d6dae39976133b2851fba4c1e1275ff',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-registry/v3/LICENSE;md5=0d6dae39976133b2851fba4c1e1275ff',
-                 'file://src/${GO_IMPORT}/vendor/github.com/edgexfoundry/go-mod-secrets/v3/LICENSE;md5=f9fa2f4f8e0ef8cc7b5dd150963eb457',
-                 'file://src/${GO_IMPORT}/vendor/github.com/fatih/color/LICENSE.md;md5=316e6d590bdcde7993fb175662c0dd5a',
-                 'file://src/${GO_IMPORT}/vendor/github.com/fxamacker/cbor/v2/LICENSE;md5=827f5a2fa861382d35a3943adf9ebb86',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-jose/go-jose/v3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-jose/go-jose/v3/json/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-kit/log/LICENSE;md5=5b7c15ad5fffe2ff6e9d58a6c161f082',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-logfmt/logfmt/LICENSE;md5=98e39517c38127f969de33057067091e',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-playground/locales/LICENSE;md5=3ccbda375ee345400ad1da85ba522301',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-playground/universal-translator/LICENSE;md5=2e2b21ef8f61057977d27c727c84bef1',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-playground/validator/v10/LICENSE;md5=a718a0f318d76f7c5d510cbae84f0b60',
-                 'file://src/${GO_IMPORT}/vendor/github.com/go-redis/redis/v7/LICENSE;md5=58103aa5ea1ee9b7a369c9c4a95ef9b5',
-                 'file://src/${GO_IMPORT}/vendor/github.com/golang/protobuf/LICENSE;md5=939cce1ec101726fa754e698ac871622',
-                 'file://src/${GO_IMPORT}/vendor/github.com/gomodule/redigo/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93',
-                 'file://src/${GO_IMPORT}/vendor/github.com/google/uuid/LICENSE;md5=88073b6dd8ec00fe09da59e0b6dfded1',
-                 'file://src/${GO_IMPORT}/vendor/github.com/gorilla/mux/LICENSE;md5=33fa1116c45f9e8de714033f99edde13',
-                 'file://src/${GO_IMPORT}/vendor/github.com/gorilla/websocket/LICENSE;md5=c007b54a1743d596f46b2748d9f8c044',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/consul/api/LICENSE;md5=b8a277a612171b7526e9be072f405ef4',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/errwrap/LICENSE;md5=b278a92d2c1509760384428817710378',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/go-cleanhttp/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/go-hclog/LICENSE;md5=ec7f605b74b9ad03347d0a93a5cc7eb8',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/go-immutable-radix/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/go-multierror/LICENSE;md5=d44fdeb607e2d2614db9464dbedd4094',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/go-rootcerts/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/golang-lru/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc',
-                 'file://src/${GO_IMPORT}/vendor/github.com/hashicorp/serf/LICENSE;md5=b278a92d2c1509760384428817710378',
-                 'file://src/${GO_IMPORT}/vendor/github.com/leodido/go-urn/LICENSE;md5=8f50db5538ec1148a9b3d14ed96c3418',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mattn/go-colorable/LICENSE;md5=24ce168f90aec2456a73de1839037245',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mattn/go-isatty/LICENSE;md5=f509beadd5a11227c27b5d2ad6c9f2c6',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mitchellh/consulstructure/LICENSE;md5=96ada10a9e51c98c4656f2cede08c673',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mitchellh/copystructure/LICENSE;md5=56da355a12d4821cda57b8f23ec34bc4',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mitchellh/go-homedir/LICENSE;md5=3f7765c3d4f58e1f84c4313cecf0f5bd',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mitchellh/mapstructure/LICENSE;md5=3f7765c3d4f58e1f84c4313cecf0f5bd',
-                 'file://src/${GO_IMPORT}/vendor/github.com/mitchellh/reflectwalk/LICENSE;md5=3f7765c3d4f58e1f84c4313cecf0f5bd',
-                 'file://src/${GO_IMPORT}/vendor/github.com/nats-io/nats.go/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327',
-                 'file://src/${GO_IMPORT}/vendor/github.com/nats-io/nkeys/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327',
-                 'file://src/${GO_IMPORT}/vendor/github.com/nats-io/nuid/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327',
-                 'file://src/${GO_IMPORT}/vendor/github.com/pmezard/go-difflib/LICENSE;md5=e9a2ebb8de779a07500ddecca806145e',
-                 'file://src/${GO_IMPORT}/vendor/github.com/rcrowley/go-metrics/LICENSE;md5=1bdf5d819f50f141366dabce3be1460f',
-                 'file://src/${GO_IMPORT}/vendor/github.com/spiffe/go-spiffe/v2/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327',
-                 'file://src/${GO_IMPORT}/vendor/github.com/stretchr/objx/LICENSE;md5=d023fd31d3ca39ec61eec65a91732735',
-                 'file://src/${GO_IMPORT}/vendor/github.com/stretchr/testify/LICENSE;md5=188f01994659f3c0d310612333d2a26f',
-                 'file://src/${GO_IMPORT}/vendor/github.com/x448/float16/LICENSE;md5=de8f8e025d57fe7ee0b67f30d571323b',
-                 'file://src/${GO_IMPORT}/vendor/github.com/zeebo/errs/LICENSE;md5=84914ab36fc0eb48edbaa53e66e8d326',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/crypto/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/mod/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/net/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/sync/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/sys/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/text/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/golang.org/x/tools/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707',
-                 'file://src/${GO_IMPORT}/vendor/google.golang.org/genproto/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57',
-                 'file://src/${GO_IMPORT}/vendor/google.golang.org/grpc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57',
-                 'file://src/${GO_IMPORT}/vendor/google.golang.org/protobuf/LICENSE;md5=02d4002e9171d41a8fad93aa7faf3956',
-                 'file://src/${GO_IMPORT}/vendor/gopkg.in/eapache/queue.v1/LICENSE;md5=1bfd4408d3de090ef6b908b0cc45a316',
-                 'file://src/${GO_IMPORT}/vendor/gopkg.in/yaml.v3/LICENSE;md5=3c91c17266710e16afdbb2b6d15c761c'])
-
+                 ['file://src/${GO_IMPORT}/vendor/github.com/godbus/dbus/v5/LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed',
+                 'file://src/${GO_IMPORT}/vendor/github.com/matryer/is/LICENSE;md5=62beaee5a116dd1e80161667b1df39ab'])
         self.assertTrue(os.path.isfile(lics_require_file))
         self._test_recipe_contents(lics_require_file, checkvars, [])
 
+        # make sure that dependencies don't mention local directory ./matryer/is
         dependencies = \
-            [   ('github.com/eclipse/paho.mqtt.golang','v1.4.2', '', '', ''),
-                ('github.com/edgexfoundry/go-mod-bootstrap','v3.0.1','github.com/edgexfoundry/go-mod-bootstrap/v3','/v3', ''),
-                ('github.com/edgexfoundry/go-mod-configuration','v3.0.0','github.com/edgexfoundry/go-mod-configuration/v3','/v3', ''),
-                ('github.com/edgexfoundry/go-mod-core-contracts','v3.0.0','github.com/edgexfoundry/go-mod-core-contracts/v3','/v3', ''),
-                ('github.com/edgexfoundry/go-mod-messaging','v3.0.0','github.com/edgexfoundry/go-mod-messaging/v3','/v3', ''),
-                ('github.com/edgexfoundry/go-mod-secrets','v3.0.1','github.com/edgexfoundry/go-mod-secrets/v3','/v3', ''),
-                ('github.com/fxamacker/cbor','v2.4.0','github.com/fxamacker/cbor/v2','/v2', ''),
-                ('github.com/gomodule/redigo','v1.8.9', '', '', ''),
-                ('github.com/google/uuid','v1.3.0', '', '', ''),
-                ('github.com/gorilla/mux','v1.8.0', '', '', ''),
-                ('github.com/rcrowley/go-metrics','v0.0.0-20201227073835-cf1acfcdf475', '', '', ''),
-                ('github.com/spiffe/go-spiffe','v2.1.4','github.com/spiffe/go-spiffe/v2','/v2', ''),
-                ('github.com/stretchr/testify','v1.8.2', '', '', ''),
-                ('go.googlesource.com/crypto','v0.8.0','golang.org/x/crypto', '', ''),
-                ('gopkg.in/eapache/queue.v1','v1.1.0', '', '', ''),
-                ('gopkg.in/yaml.v3','v3.0.1', '', '', ''),
-                ('github.com/microsoft/go-winio','v0.6.0','github.com/Microsoft/go-winio', '', ''),
-                ('github.com/hashicorp/go-metrics','v0.3.10','github.com/armon/go-metrics', '', ''),
-                ('github.com/cenkalti/backoff','v2.2.1+incompatible', '', '', ''),
-                ('github.com/davecgh/go-spew','v1.1.1', '', '', ''),
-                ('github.com/edgexfoundry/go-mod-registry','v3.0.0','github.com/edgexfoundry/go-mod-registry/v3','/v3', ''),
-                ('github.com/fatih/color','v1.9.0', '', '', ''),
-                ('github.com/go-jose/go-jose','v3.0.0','github.com/go-jose/go-jose/v3','/v3', ''),
-                ('github.com/go-kit/log','v0.2.1', '', '', ''),
-                ('github.com/go-logfmt/logfmt','v0.5.1', '', '', ''),
-                ('github.com/go-playground/locales','v0.14.1', '', '', ''),
-                ('github.com/go-playground/universal-translator','v0.18.1', '', '', ''),
-                ('github.com/go-playground/validator','v10.13.0','github.com/go-playground/validator/v10','/v10', ''),
-                ('github.com/go-redis/redis','v7.3.0','github.com/go-redis/redis/v7','/v7', ''),
-                ('github.com/golang/protobuf','v1.5.2', '', '', ''),
-                ('github.com/gorilla/websocket','v1.4.2', '', '', ''),
-                ('github.com/hashicorp/consul','v1.20.0','github.com/hashicorp/consul/api', '', 'api'),
-                ('github.com/hashicorp/errwrap','v1.0.0', '', '', ''),
-                ('github.com/hashicorp/go-cleanhttp','v0.5.1', '', '', ''),
-                ('github.com/hashicorp/go-hclog','v0.14.1', '', '', ''),
-                ('github.com/hashicorp/go-immutable-radix','v1.3.0', '', '', ''),
-                ('github.com/hashicorp/go-multierror','v1.1.1', '', '', ''),
-                ('github.com/hashicorp/go-rootcerts','v1.0.2', '', '', ''),
-                ('github.com/hashicorp/golang-lru','v0.5.4', '', '', ''),
-                ('github.com/hashicorp/serf','v0.10.1', '', '', ''),
-                ('github.com/leodido/go-urn','v1.2.3', '', '', ''),
-                ('github.com/mattn/go-colorable','v0.1.12', '', '', ''),
-                ('github.com/mattn/go-isatty','v0.0.14', '', '', ''),
-                ('github.com/mitchellh/consulstructure','v0.0.0-20190329231841-56fdc4d2da54', '', '', ''),
-                ('github.com/mitchellh/copystructure','v1.2.0', '', '', ''),
-                ('github.com/mitchellh/go-homedir','v1.1.0', '', '', ''),
-                ('github.com/mitchellh/mapstructure','v1.5.0', '', '', ''),
-                ('github.com/mitchellh/reflectwalk','v1.0.2', '', '', ''),
-                ('github.com/nats-io/nats.go','v1.25.0', '', '', ''),
-                ('github.com/nats-io/nkeys','v0.4.4', '', '', ''),
-                ('github.com/nats-io/nuid','v1.0.1', '', '', ''),
-                ('github.com/pmezard/go-difflib','v1.0.0', '', '', ''),
-                ('github.com/stretchr/objx','v0.5.0', '', '', ''),
-                ('github.com/x448/float16','v0.8.4', '', '', ''),
-                ('github.com/zeebo/errs','v1.3.0', '', '', ''),
-                ('go.googlesource.com/mod','v0.8.0','golang.org/x/mod', '', ''),
-                ('go.googlesource.com/net','v0.9.0','golang.org/x/net', '', ''),
-                ('go.googlesource.com/sync','v0.1.0','golang.org/x/sync', '', ''),
-                ('go.googlesource.com/sys','v0.7.0','golang.org/x/sys', '', ''),
-                ('go.googlesource.com/text','v0.9.0','golang.org/x/text', '', ''),
-                ('go.googlesource.com/tools','v0.6.0','golang.org/x/tools', '', ''),
-                ('github.com/googleapis/go-genproto','v0.0.0-20230223222841-637eb2293923','google.golang.org/genproto', '', ''),
-                ('github.com/grpc/grpc-go','v1.53.0','google.golang.org/grpc', '', ''),
-                ('go.googlesource.com/protobuf','v1.28.1','google.golang.org/protobuf', '', ''),
-            ]
-
-        src_uri = set()
-        for d in dependencies:
-            src_uri.add(self._go_urifiy(*d))
-
-        checkvars = {}
-        checkvars['GO_DEPENDENCIES_SRC_URI'] = src_uri
-
-        self.assertTrue(os.path.isfile(deps_require_file))
-        self._test_recipe_contents(deps_require_file, checkvars, [])
-
-    def test_recipetool_create_go_replace_modules(self):
-        # Check handling of replaced modules
-        temprecipe = os.path.join(self.tempdir, 'recipe')
-        os.makedirs(temprecipe)
-
-        recipefile = os.path.join(temprecipe, 'openapi-generator_git.bb')
-        deps_require_file = os.path.join(temprecipe, 'openapi-generator', 'go-modules.inc')
-        lics_require_file = os.path.join(temprecipe, 'openapi-generator', 'go-licenses.inc')
-        modules_txt_file = os.path.join(temprecipe, 'openapi-generator', 'modules.txt')
-
-        srcuri = 'https://github.com/OpenAPITools/openapi-generator.git'
-        srcrev = "v7.2.0"
-        srcbranch = "master"
-        srcsubdir = "samples/openapi3/client/petstore/go"
-
-        result = runCmd('recipetool create -o %s %s -S %s -B %s --src-subdir %s' % (temprecipe, srcuri, srcrev, srcbranch, srcsubdir))
-
-        self.maxDiff = None
-        inherits = ['go-vendor']
-
-        checkvars = {}
-        checkvars['GO_IMPORT'] = "github.com/OpenAPITools/openapi-generator/samples/openapi3/client/petstore/go"
-        checkvars['SRC_URI'] = {'git://${GO_IMPORT};destsuffix=git/src/${GO_IMPORT};nobranch=1;name=${BPN};protocol=https',
-                                'file://modules.txt'}
-
-        self.assertNotIn('Traceback', result.output)
-        self.assertIn('No license file was detected for the main module', result.output)
-        self.assertTrue(os.path.isfile(recipefile))
-        self._test_recipe_contents(recipefile, checkvars, inherits)
-
-        # make sure that dependencies don't mention local directory ./go-petstore
-        dependencies = \
-            [   ('github.com/stretchr/testify','v1.8.4', '', '', ''),
-                ('go.googlesource.com/oauth2','v0.10.0','golang.org/x/oauth2', '', ''),
-                ('github.com/davecgh/go-spew','v1.1.1', '', '', ''),
-                ('github.com/golang/protobuf','v1.5.3', '', '', ''),
-                ('github.com/kr/pretty','v0.3.0', '', '', ''),
-                ('github.com/pmezard/go-difflib','v1.0.0', '', '', ''),
-                ('github.com/rogpeppe/go-internal','v1.9.0', '', '', ''),
-                ('go.googlesource.com/net','v0.12.0','golang.org/x/net', '', ''),
-                ('github.com/golang/appengine','v1.6.7','google.golang.org/appengine', '', ''),
-                ('go.googlesource.com/protobuf','v1.31.0','google.golang.org/protobuf', '', ''),
-                ('gopkg.in/check.v1','v1.0.0-20201130134442-10cb98267c6c', '', '', ''),
-                ('gopkg.in/yaml.v3','v3.0.1', '', '', ''),
+            [   ('github.com/godbus/dbus','v5.1.0', 'github.com/godbus/dbus/v5', '/v5', ''),
             ]
 
         src_uri = set()
#6 lore raw

PATCH 6/19 pseudo: Upgrade 1.9.11 -> 1.9.12+git

In reply to Fabien Thomas

From: Yoann Congal <[email protected]>

Switch from master to the pseudo-1.9 stable branch.

Changelog:
* pseudo_client: Fix xattr/rename handling with empty paths
* ports/linux/guts: Add open_tree wrapper
* test: Add open_tree test
* ports/linux/pseudo_wrappers.c: Add syscall support for open_tree() wrapper
* test: Add open_tree syscall test
* test: Add open_tree_attr syscall test
* ports/linux/guts: Add open_tree_attr wrapper
* ports/linux/pseudo_wrappers: forward pre-init syscall/prctl to the real function
* pseudo_util: bound pseudo_get_value()'s recovery re-init
* Makefile.in: Bump to 1.9.12
* ports/linux: Add missing header
* ports/linux: Fix header ordering for Ubuntu 22.04
* ports/linux/guts: Fix uninitialized pseudo_path in open_tree wrappers

---
 meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +3 -3
index 1320d19ad4..764f81b683 100644
@@ -1,6 +1,6 @@
 require pseudo.inc
 
-SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
+SRC_URI = "git://git.yoctoproject.org/pseudo;branch=pseudo-1.9;protocol=https \
            file://fallback-passwd \
            file://fallback-group \
            "
@@ -12,9 +12,9 @@ SRC_URI:append:class-nativesdk = " \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
-SRCREV = "ba8887e5f1e922f866681ec7dec1a00b602a9328"
+SRCREV = "e627b0dcb639f387db935fae1f9b93b30cded5e1"
 S = "${WORKDIR}/git"
-PV = "1.9.11"
+PV = "1.9.12+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
#7 lore raw

PATCH 7/19 TEST-pseudo: test patches

In reply to Fabien Thomas

From: Yoann Congal <[email protected]>

---
 ...ree-tests-when-the-function-or-sysca.patch | 157 ++++++++
 ...-t-generate-unused-_int-paths-with-n.patch |  59 +++
 ...ts-linux-Don-t-require-linux-mount.h.patch |  67 ++++
 ...004-configure-Require-GCC-5-or-later.patch |  76 ++++
 ...erialize-path-changes-across-clients.patch | 339 ++++++++++++++++++
 ...ath-lock-in-create-and-metadata-wrap.patch | 182 ++++++++++
 ...ted-files-under-the-path-lock-before.patch | 248 +++++++++++++
 ...s-Add-a-parallel-create-rename-link-.patch |  87 +++++
 ...Add-information-specific-to-file-pro.patch | 216 +++++++++++
 ...S.md-Add-to-assist-future-developers.patch | 113 ++++++
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  10 +
 11 files changed, 1554 insertions(+)
 create mode 100644 meta/recipes-devtools/pseudo/files/0001-test-Skip-open_tree-tests-when-the-function-or-sysca.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0002-makewrappers-Don-t-generate-unused-_int-paths-with-n.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0003-ports-linux-Don-t-require-linux-mount.h.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0004-configure-Require-GCC-5-or-later.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0005-pseudo_client-serialize-path-changes-across-clients.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0006-ports-hold-the-path-lock-in-create-and-metadata-wrap.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0007-ports-check-created-files-under-the-path-lock-before.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0008-test-parallel-ops-Add-a-parallel-create-rename-link-.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0009-README.security-Add-information-specific-to-file-pro.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0010-AGENTS.md-Add-to-assist-future-developers.patch
meta/recipes-devtools/pseudo/files/0001-test-Skip-open_tree-tests-when-the-function-or-sysca.patch new file +157 -0
new file mode 100644
index 0000000000..4100a66213
@@ -0,0 +1,157 @@
+From a4ba40892a621f342846139397fb2c636ca9dcf8 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <[email protected]>
+Date: Wed, 11 Nov 2026 10:15:03 -0600
+Subject: [PATCH] test: Skip open_tree tests when the function or syscall is
+ unavailable
+
+From: Mark Hatle <[email protected]>
+
+test-open_tree failed to build on systems where glibc does not provide
+open_tree() (added in glibc 2.36), e.g. Ubuntu 22.04, breaking 'make test'.
+
+Declare open_tree() weak so the test links, and skip the test if the
+symbol is not resolved or the call returns ENOSYS. Under pseudo the
+symbol always resolves to libpseudo's wrapper, which returns ENOSYS
+when libc lacks open_tree().
+
+test-open_tree_attr-syscall failed on kernels older than 6.15 which do
+not implement the open_tree_attr syscall. Probe the syscall first and
+skip the test if it returns ENOSYS.
+
+Both tests return 77 to indicate a skip, which the shell wrappers convert
+to 255 so run_tests.sh reports them as skipped, matching the existing
+openat2 tests.
+
+(cherry picked from commit ef3fadb80ea4822fd6ddbdd6fd21dd6a358f010f)
+
+Upstream-Status: Pending [patches under test, https://lore.kernel.org/all/[email protected]/]
+AI-Generated: Uses GitHub Copilot
+Signed-off-by: Mark Hatle <[email protected]>
+Signed-off-by: Mark Hatle <[email protected]>
+Signed-off-by: Yoann Congal <[email protected]>
+---
+ test/test-open_tree.c               | 25 +++++++++++++++++++++++++
+ test/test-open_tree.sh              | 15 +++++++++++++--
+ test/test-open_tree_attr-syscall.c  | 11 +++++++++++
+ test/test-open_tree_attr-syscall.sh | 15 +++++++++++++--
+ 4 files changed, 62 insertions(+), 4 deletions(-)
+
+diff --git a/test/test-open_tree.c b/test/test-open_tree.c
+index 9570f11..3b1b7ea 100644
+--- a/test/test-open_tree.c
++++ b/test/test-open_tree.c
+@@ -10,6 +10,14 @@
+ #define TEST_DIR "test-open-tree-dir"
+ #define TEST_FILE "test-open-tree-file"
+ 
++/*
++ * Older glibc versions (< 2.36) do not provide open_tree().  Declare it
++ * weak so the test still links; at runtime it resolves to glibc's or
++ * libpseudo's open_tree if either provides it, otherwise it is NULL and
++ * the test is skipped.
++ */
++extern int open_tree(int dirfd, const char *path, unsigned int flags) __attribute__((weak));
++
+ static int test_no_flags(void) {
+     int treefd = -1;
+     int fd = -1;
+@@ -124,6 +132,23 @@ static void cleanup(void) {
+ }
+ 
+ int main(void) {
++    int probefd;
++
++    if (!open_tree) {
++        fprintf(stderr, "open_tree() not available, skipping.\n");
++        return 77;
++    }
++
++    /* pseudo exports open_tree() but returns ENOSYS if libc lacks it */
++    probefd = open_tree(AT_FDCWD, ".", 0);
++    if (probefd == -1 && errno == ENOSYS) {
++        fprintf(stderr, "open_tree() returned ENOSYS, skipping.\n");
++        return 77;
++    }
++    if (probefd != -1) {
++        close(probefd);
++    }
++
+     cleanup();
+ 
+     if (mkdir(TEST_DIR, 0777) == -1) {
+diff --git a/test/test-open_tree.sh b/test/test-open_tree.sh
+index 427d550..274c654 100755
+--- a/test/test-open_tree.sh
++++ b/test/test-open_tree.sh
+@@ -1,9 +1,20 @@
+ #!/bin/sh
+ 
+-./test/test-open_tree
++# rc 77 indicates open_tree() is not available, so report skipped (255).
++# This usually indicates that glibc does not have the open_tree function.
++run_test() {
++	"$@"
++	rc=$?
++	if [ "$rc" -eq 77 ]; then
++		exit 255
++	fi
++	return "$rc"
++}
++
++run_test ./test/test-open_tree
+ rc1=$?
+ 
+-PSEUDO_IGNORE_PATHS=/ ./test/test-open_tree
++run_test env PSEUDO_IGNORE_PATHS=/ ./test/test-open_tree
+ rc2=$?
+ 
+ exit $((rc1 | rc2))
+diff --git a/test/test-open_tree_attr-syscall.c b/test/test-open_tree_attr-syscall.c
+index cc38c5f..e4e652e 100644
+--- a/test/test-open_tree_attr-syscall.c
++++ b/test/test-open_tree_attr-syscall.c
+@@ -150,6 +150,17 @@ static void cleanup(void) {
+ }
+ 
+ int main(void) {
++    int probefd;
++
++    probefd = do_open_tree_attr_syscall(AT_FDCWD, ".", 0);
++    if (probefd == -1 && errno == ENOSYS) {
++        fprintf(stderr, "open_tree_attr syscall not supported, skipping.\n");
++        return 77;
++    }
++    if (probefd != -1) {
++        close(probefd);
++    }
++
+     cleanup();
+ 
+     if (mkdir(TEST_DIR, 0777) == -1) {
+diff --git a/test/test-open_tree_attr-syscall.sh b/test/test-open_tree_attr-syscall.sh
+index f6e51f4..d87043e 100755
+--- a/test/test-open_tree_attr-syscall.sh
++++ b/test/test-open_tree_attr-syscall.sh
+@@ -1,9 +1,20 @@
+ #!/bin/sh
+ 
+-./test/test-open_tree_attr-syscall
++# rc 77 indicates the open_tree_attr syscall is not supported (ENOSYS),
++# so report skipped (255).  This usually indicates an older kernel.
++run_test() {
++	"$@"
++	rc=$?
++	if [ "$rc" -eq 77 ]; then
++		exit 255
++	fi
++	return "$rc"
++}
++
++run_test ./test/test-open_tree_attr-syscall
+ rc1=$?
+ 
+-PSEUDO_IGNORE_PATHS=/ ./test/test-open_tree_attr-syscall
++run_test env PSEUDO_IGNORE_PATHS=/ ./test/test-open_tree_attr-syscall
+ rc2=$?
+ 
+ exit $((rc1 | rc2))
meta/recipes-devtools/pseudo/files/0002-makewrappers-Don-t-generate-unused-_int-paths-with-n.patch new file +59 -0

59 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0003-ports-linux-Don-t-require-linux-mount.h.patch new file +67 -0

67 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0004-configure-Require-GCC-5-or-later.patch new file +76 -0

76 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0005-pseudo_client-serialize-path-changes-across-clients.patch new file +339 -0

339 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0006-ports-hold-the-path-lock-in-create-and-metadata-wrap.patch new file +182 -0

182 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0007-ports-check-created-files-under-the-path-lock-before.patch new file +248 -0

248 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0008-test-parallel-ops-Add-a-parallel-create-rename-link-.patch new file +87 -0

87 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0009-README.security-Add-information-specific-to-file-pro.patch new file +216 -0

216 lines not on this page · raw message

meta/recipes-devtools/pseudo/files/0010-AGENTS.md-Add-to-assist-future-developers.patch new file +113 -0

113 lines not on this page · raw message

meta/recipes-devtools/pseudo/pseudo_git.bb +10 -0
index 764f81b683..82f1f946b8 100644
@@ -3,6 +3,16 @@ require pseudo.inc
 SRC_URI = "git://git.yoctoproject.org/pseudo;branch=pseudo-1.9;protocol=https \
            file://fallback-passwd \
            file://fallback-group \
+           file://0001-test-Skip-open_tree-tests-when-the-function-or-sysca.patch \
+           file://0002-makewrappers-Don-t-generate-unused-_int-paths-with-n.patch \
+           file://0003-ports-linux-Don-t-require-linux-mount.h.patch \
+           file://0004-configure-Require-GCC-5-or-later.patch \
+           file://0005-pseudo_client-serialize-path-changes-across-clients.patch \
+           file://0006-ports-hold-the-path-lock-in-create-and-metadata-wrap.patch \
+           file://0007-ports-check-created-files-under-the-path-lock-before.patch \
+           file://0008-test-parallel-ops-Add-a-parallel-create-rename-link-.patch \
+           file://0009-README.security-Add-information-specific-to-file-pro.patch \
+           file://0010-AGENTS.md-Add-to-assist-future-developers.patch \
            "
 SRC_URI:append:class-native = " \
     http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
#8 lore raw

Re: [OE-core][scarthgap 07/19] TEST-pseudo: test patches

Quoted 19 lines · Fabien Thomas via openembedded-core

From: Yoann Congal <[email protected]>

---
 ...ree-tests-when-the-function-or-sysca.patch | 157 ++++++++
 ...-t-generate-unused-_int-paths-with-n.patch |  59 +++
 ...ts-linux-Don-t-require-linux-mount.h.patch |  67 ++++
 ...004-configure-Require-GCC-5-or-later.patch |  76 ++++
 ...erialize-path-changes-across-clients.patch | 339 ++++++++++++++++++
 ...ath-lock-in-create-and-metadata-wrap.patch | 182 ++++++++++
 ...ted-files-under-the-path-lock-before.patch | 248 +++++++++++++
 ...s-Add-a-parallel-create-rename-link-.patch |  87 +++++
 ...Add-information-specific-to-file-pro.patch | 216 +++++++++++
 ...S.md-Add-to-assist-future-developers.patch | 113 ++++++
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  10 +
 11 files changed, 1554 insertions(+)
 create mode 100644 meta/recipes-devtools/pseudo/files/0001-test-Skip-open_tree-tests-when-the-function-or-sysca.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0002-makewrappers-Don-t-generate-unused-_int-paths-with-n.patch
Quoted 8 lines
 create mode 100644 meta/recipes-devtools/pseudo/files/0003-ports-linux-Don-t-require-linux-mount.h.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0004-configure-Require-GCC-5-or-later.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0005-pseudo_client-serialize-path-changes-across-clients.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0006-ports-hold-the-path-lock-in-create-and-metadata-wrap.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0007-ports-check-created-files-under-the-path-lock-before.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0008-test-parallel-ops-Add-a-parallel-create-rename-link-.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0009-README.security-Add-information-specific-to-file-pro.patch
 create mode 100644 meta/recipes-devtools/pseudo/files/0010-AGENTS.md-Add-to-assist-future-developers.patch

This is a test patch that should not be merged like this. I'll do a proper upgrade in the next series.

Signature · 2 lines
Yoann Congal
Smile ECS
#9 lore raw

PATCH 8/19 popt: patch CVE-2026-18739

In reply to Fabien Thomas

From: Peter Marko <[email protected]>

Pick patch referencing this CVE.
Convert change in cmake file to autotools/makefile. Install the new test in recipe.

[fatho: fix CVE metadata]
---
 .../popt/popt/CVE-2026-18739.patch            | 92 +++++++++++++++++++
 meta/recipes-support/popt/popt_1.19.bb        |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 meta/recipes-support/popt/popt/CVE-2026-18739.patch
meta/recipes-support/popt/popt/CVE-2026-18739.patch new file +92 -0
new file mode 100644
index 0000000000..94366f6343
@@ -0,0 +1,92 @@
+From 14c42b415ba0c11640f7d4ee80920452d0287058 Mon Sep 17 00:00:00 2001
+From: Yao Zhang <[email protected]>
+Date: Wed, 5 Aug 2026 14:52:10 +0800
+Subject: [PATCH] Fix CVE-2026-18739: off-by-one error in poptStuffArgs()
+
+The poptStuffArgs function only checks whether (con->os - con->optionStack)
+is equal to POPT_OPTION_DEPTH (10) before incrementing con->os, and does
+not increment the value by 1 to perform boundary pre-checking, as
+handleAlias does.
+
+Add a new test program as a reproducer for this case.
+
+Co-authored-by: Panu Matilainen <[email protected]>
+
+Fixes: CVE-2026-18739
+
+CVE: CVE-2026-18739
+Upstream-Status: Backport [https://github.com/rpm-software-management/popt/commit/14c42b415ba0c11640f7d4ee80920452d0287058]
+Signed-off-by: Peter Marko <[email protected]>
+---
+ src/popt.c        |  2 +-
+ tests/Makefile.am |  5 ++++-
+ tests/testit.sh   |  2 ++
+ tests/tstuff.c    | 17 +++++++++++++++++
+ 4 files changed, 24 insertions(+), 2 deletions(-)
+ create mode 100644 tests/tstuff.c
+
+diff --git a/src/popt.c b/src/popt.c
+index 9ea3dfe..458aadc 100644
+--- a/src/popt.c
++++ b/src/popt.c
+@@ -1668,7 +1668,7 @@ int poptStuffArgs(poptContext con, const char ** argv)
+     int argc;
+     int rc;
+ 
+-    if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
++    if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
+ 	return POPT_ERROR_OPTSTOODEEP;
+ 
+     for (argc = 0; argv[argc]; argc++)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index c410389..99fbf64 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -11,7 +11,10 @@ EXTRA_DIST = testit.sh \
+ 
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/src
+ 
+-noinst_PROGRAMS = test1 test2 tdict test3
++noinst_PROGRAMS = test1 test2 tdict test3 tstuff
++tstuff_SOURCES = tstuff.c
++tstuff_LDFLAGS =
++tstuff_LDADD = $(top_builddir)/src/libpopt.la
+ test1_SOURCES = test1.c
+ test1_LDFLAGS = 
+ test1_LDADD = $(top_builddir)/src/libpopt.la
+diff --git a/tests/testit.sh b/tests/testit.sh
+index 4078f51..d26be3a 100755
+--- a/tests/testit.sh
++++ b/tests/testit.sh
+@@ -172,6 +172,8 @@ run test1 "test1 - 61" "" -x=f1
+ 
+ run test1 "test1 - 62" "arg1: 0 arg2: (none) aInt: 1" --randint=-1
+ 
++run tstuff "tstuff - 1" "-13"
++
+ if ! [ -e test3-data ]; then
+   # create symlink for running during 'make distcheck'
+   ln -s "${srcdir}/test3-data" test3-data
+diff --git a/tests/tstuff.c b/tests/tstuff.c
+new file mode 100644
+index 0000000..b820c7b
+--- /dev/null
++++ b/tests/tstuff.c
+@@ -0,0 +1,17 @@
++#include <stdio.h>
++#include <popt.h>
++
++int main(int argc, char *argv[])
++{
++    poptContext ctx = poptGetContext(argv[0], argc, (const char **)argv, NULL, 0);
++    int rc = 0;
++    for (int i = 0; i < 100; ++i) {
++	const char *ea[] = { "a", NULL };
++	if ((rc = poptStuffArgs(ctx, ea)))
++	    break;
++    }
++    printf("%d\n", rc);
++
++    poptFreeContext(ctx);
++    return rc;
++}
meta/recipes-support/popt/popt_1.19.bb +2 -0
index c8b4875c1b..18cc4f2867 100644
@@ -11,6 +11,7 @@ DEPENDS = "virtual/libiconv"
 SRC_URI = "http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz \
            file://run-ptest \
            file://CVE-2026-18743.patch \
+           file://CVE-2026-18739.patch \
            "
 SRC_URI[sha256sum] = "c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9"
 
@@ -25,6 +26,7 @@ do_compile_ptest() {
 do_install_ptest() {
     install ${B}/tests/.libs/test* ${D}/${PTEST_PATH}
     install ${B}/tests/.libs/tdict ${D}/${PTEST_PATH}
+    install ${B}/tests/.libs/tstuff ${D}/${PTEST_PATH}
     install ${B}/tests/testit.sh ${D}/${PTEST_PATH}
     install ${B}/tests/test-poptrc ${D}/${PTEST_PATH}
 }
#10 lore raw

PATCH 9/19 glibc: patch CVE-2026-86805 and CVE-2026-95818

In reply to Fabien Thomas

From: Peter Marko <[email protected]>

Pick patch [1] which is [2] backported to 2.41 (oldest release still receiving security updates) which is mentioned in [3] and [4].

On request, all testing code was removed from the patch.

[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=629565b0c91dc326ac622b05982f21a374cd03c4
[2] https://sourceware.org/git/?p=glibc.git;a=commit;h=ed0c137b97eb940b4b64981e84ed806d3276edd9
[3] https://security-tracker.debian.org/tracker/CVE-2026-86805
[4] https://security-tracker.debian.org/tracker/CVE-2026-95818

---
 .../0049-CVE-2026-86805-CVE-2026-95818.patch  | 267 ++++++++++++++++++
 meta/recipes-core/glibc/glibc_2.39.bb         |   1 +
 2 files changed, 268 insertions(+)
 create mode 100644 meta/recipes-core/glibc/glibc/0049-CVE-2026-86805-CVE-2026-95818.patch
meta/recipes-core/glibc/glibc/0049-CVE-2026-86805-CVE-2026-95818.patch new file +267 -0
new file mode 100644
index 0000000000..dde4f8b901
@@ -0,0 +1,267 @@
+From 629565b0c91dc326ac622b05982f21a374cd03c4 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <[email protected]>
+Date: Mon, 17 Aug 2026 15:15:32 -0300
+Subject: [PATCH] elf: Open the normalized $ORIGIN rpath in AT_SECURE programs
+ (BZ 34360)
+
+For AT_SECURE programs the loader honors $ORIGIN in DT_RPATH only when the
+expansion is rooted in a trusted directory, but it validated the lexically
+normalized path while opening the raw expansion.  As "a/b/../c" only names
+"a/c" when "b" is not a symlink, an attacker who controls a component of
+$ORIGIN -- e.g. by hard-linking the setuid binary into an attacker-owned
+directory -- can make the opened path escape the trusted directory even
+though the check passed, loading an attacker-controlled object.
+
+Normalize the expansion in place and open that, so the path that is opened
+is exactly the path that was validated.  _dl_normalize_path rewrites the
+string in place without ever advancing its write cursor past its read
+cursor or appending, so it stays within the original storage.
+
+Add elf/tst-origin-secure as a regression test.
+
+Reviewed-by: Florian Weimer <[email protected]>
+(cherry picked from commit ed0c137b97eb940b4b64981e84ed806d3276edd9)
+
+CVE: CVE-2026-86805
+CVE: CVE-2026-95818
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=629565b0c91dc326ac622b05982f21a374cd03c4]
+Omit the regression tests and their test harness prerequisites from this backport.
+Signed-off-by: Peter Marko <[email protected]>
+---
+ elf/dl-load.c           |  74 +++++++++----------------
+ elf/dl-path-normalize.h | 118 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 143 insertions(+), 49 deletions(-)
+ create mode 100644 elf/dl-path-normalize.h
+
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 7b21f1dffa..0d141a61c1 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <gnu/lib-names.h>
++#include <dl-path-normalize.h>
+ 
+ /* Type for the buffer we put the ELF header and hopefully the program
+    header.  This buffer does not really have to be too large.  In most
+@@ -124,54 +125,24 @@ static const size_t system_dirs_len[] =
+ };
+ #define nsystem_dirs_len array_length (system_dirs_len)
+ 
++/* Return true if the normalized path NPATH of length NLEN is rooted in one of
++   the trusted system directories.  The system_dirs entries carry a trailing
++   '/'; NPATH matches an entry when it shares the entry's leading component
++   sequence and then either ends or continues with '/'.  For instance,
++   "/lib64" and "/lib64/x" match "/lib64/" but "/lib64x" does not.  */
+ static bool
+-is_trusted_path_normalize (const char *path, size_t len)
++path_is_trusted (const char *npath, size_t nlen)
+ {
+-  if (len == 0)
+-    return false;
+-
+-  char *npath = (char *) alloca (len + 2);
+-  char *wnp = npath;
+-  while (*path != '\0')
+-    {
+-      if (path[0] == '/')
+-	{
+-	  if (path[1] == '.')
+-	    {
+-	      if (path[2] == '.' && (path[3] == '/' || path[3] == '\0'))
+-		{
+-		  while (wnp > npath && *--wnp != '/')
+-		    ;
+-		  path += 3;
+-		  continue;
+-		}
+-	      else if (path[2] == '/' || path[2] == '\0')
+-		{
+-		  path += 2;
+-		  continue;
+-		}
+-	    }
+-
+-	  if (wnp > npath && wnp[-1] == '/')
+-	    {
+-	      ++path;
+-	      continue;
+-	    }
+-	}
+-
+-      *wnp++ = *path++;
+-    }
+-
+-  if (wnp == npath || wnp[-1] != '/')
+-    *wnp++ = '/';
+-
+   const char *trun = system_dirs;
+ 
+   for (size_t idx = 0; idx < nsystem_dirs_len; ++idx)
+     {
+-      if (wnp - npath >= system_dirs_len[idx]
+-	  && memcmp (trun, npath, system_dirs_len[idx]) == 0)
+-	/* Found it.  */
++      /* Compare against the entry without its trailing '/'.  */
++      size_t dirlen = system_dirs_len[idx] - 1;
++
++      if (nlen >= dirlen
++	  && memcmp (trun, npath, dirlen) == 0
++	  && (npath[dirlen] == '/' || npath[dirlen] == '\0'))
+ 	return true;
+ 
+       trun += system_dirs_len[idx] + 1;
+@@ -361,16 +332,21 @@ _dl_dst_substitute (struct link_map *l, const char *input, char *result)
+      checked for trust, the authors of the binaries themselves are
+      trusted to have designed this correctly.  Only $ORIGIN is tested in
+      this way because it may be manipulated in some ways with hard
+-     links.  */
+-  if (__glibc_unlikely (check_for_trusted)
+-      && !is_trusted_path_normalize (result, wp - result))
+-    {
+-      *result = '\0';
+-      return result;
+-    }
++     links.
++
++     _dl_normalize_path replaces the expansion with its normalized form
++     in place, so that the path that is opened is exactly the path that
++     was validated.  */
+ 
+   *wp = '\0';
+ 
++  if (__glibc_unlikely (check_for_trusted))
++    {
++      size_t nlen = _dl_normalize_path (result);
++      if (!path_is_trusted (result, nlen))
++	*result = '\0';
++    }
++
+   return result;
+ }
+ 
+diff --git a/elf/dl-path-normalize.h b/elf/dl-path-normalize.h
+new file mode 100644
+index 0000000000..ca4b14698c
+--- /dev/null
++++ b/elf/dl-path-normalize.h
+@@ -0,0 +1,118 @@
++/* In-place lexical path normalization for the dynamic loader.
++   Copyright (C) 2026 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#ifndef _DL_PATH_NORMALIZE_H
++#define _DL_PATH_NORMALIZE_H
++
++#include <stddef.h>
++#include <string.h>
++
++/* Lexically normalize the null-terminated PATH in place and return the
++   length of the result (excluding the terminating NUL byte):
++
++   - Runs of '/' are collapsed to a single '/'.
++
++   - "." components are removed.
++
++   - A ".." component removes the preceding component if there is one and it
++     is not itself a preserved "..".  In an absolute path a surplus ".." at
++     the root is dropped ("/../a" normalizes to "/a"), in a relative path
++     leading ".." components are preserved ("../a" stays "../a", "a/../../b"
++     normalizes to "../b").
++
++   - The result has no trailing '/' except for the root path "/" itself
++     ("/a/" normalizes to "/a").
++
++   - The result is empty if and only if every component cancels or is removed
++     ("", ".", "a/.." all normalize to "").
++
++   The PATH is written in place, and the internal write cursor never runs
++   ahead of the read cursor.  Only bytes within the strlen (PATH) + 1 storage
++   are accessed.  */
++static inline size_t
++_dl_normalize_path (char *path)
++{
++  /* The root '/' of an absolute path is not removed.  */
++  char *pstart = path + (path[0] == '/');
++  const char *rnp = pstart;
++  char *wnp = pstart;
++  /* End of the prefix a ".." may not remove.  Either the root '/', or, for
++     relative paths, the original start of the string extended by any
++     preserved leading ".." components.  */
++  char *limit = pstart;
++
++  while (*rnp != '\0')
++    {
++      /* Collapse consecutive separators.  */
++      if (*rnp == '/')
++	{
++	  ++rnp;
++	  continue;
++	}
++
++      /* [RNP, REND) is the next input component.  */
++      const char *rend = rnp;
++      while (*rend != '\0' && *rend != '/')
++	++rend;
++      size_t clen = rend - rnp;
++
++      /* Drop '.' component.  */
++      if (clen == 1 && rnp[0] == '.')
++	;
++      else if (clen == 2 && rnp[0] == '.' && rnp[1] == '.')
++	{
++	  if (wnp > limit)
++	    {
++	      /* Remove the last component along with the '/' separating it
++		 from its predecessor (the root '/' of an absolute path is
++		 retained).  */
++	      while (wnp > limit && wnp[-1] != '/')
++		--wnp;
++	      if (wnp > pstart)
++		--wnp;
++	    }
++	  else if (pstart == path)
++	    {
++	      /* No component is left and the original path is relative:
++		 keep the unresolvable ".." (it becomes part of the
++		 preserved prefix).  */
++	      if (wnp > pstart)
++		*wnp++ = '/';
++	      *wnp++ = '.';
++	      *wnp++ = '.';
++	      limit = wnp;
++	    }
++	  /* Otherwise the path is absolute and the surplus ".." at the
++	     root is dropped ("/../a" normalizes to "/a").  */
++	}
++      else
++	{
++	  if (wnp > pstart)
++	    *wnp++ = '/';
++	  memmove (wnp, rnp, clen);
++	  wnp += clen;
++	}
++
++      rnp = rend;
++    }
++
++  *wnp = '\0';
++  return wnp - path;
++}
++
++#endif /* _DL_PATH_NORMALIZE_H */
meta/recipes-core/glibc/glibc_2.39.bb +1 -0
index 09ac0fc53f..1598249b7b 100644
@@ -77,6 +77,7 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0042-CVE-2026-8674.patch \
            file://0047-CVE-2026-89092.patch \
            file://0048-CVE-2026-97399.patch \
+           file://0049-CVE-2026-86805-CVE-2026-95818.patch \
 "
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
#11 lore raw

PATCH 10/19 curl: fix CVE-2026-92389

In reply to Fabien Thomas

From: Adarsh Jagadish Kamini <[email protected]>

Backport patch to fix CVE-2026-92389.

References:
https://nvd.nist.gov/vuln/detail/CVE-2026-92389

Upstream fix:
https://github.com/curl/curl/commit/63dd390fab905a239a97e270

Tested with ptest:
Before: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0
After: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0

[bajau: fixed recipe files list]
---
 .../curl/curl/CVE-2026-92389.patch            | 60 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.7.1.bb       |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92389.patch
meta/recipes-support/curl/curl/CVE-2026-92389.patch new file +60 -0
new file mode 100644
index 0000000000..387cca9ee1
@@ -0,0 +1,60 @@
+From a1705881527f7ee59606a61c4ba52e0737655571 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Wed, 16 Sep 2026 23:46:44 +0200
+Subject: [PATCH] tftp: verify direction in a few places
+
+Closes #22974
+
+Conflicts Resolved:
+
+Adaptation notes:
+- Upstream moved tftp_tx() above tftp_connect_for_tx(); kept 8.7.1 layout and added the upload check in tftp_tx().
+
+Assisted-by: kiro:claude-opus-5.5
+
+CVE: CVE-2026-92389
+Upstream-Status: Backport [https://github.com/curl/curl/commit/63dd390fab905a239a97e270]
+
+Signed-off-by: Adarsh Jagadish Kamini <[email protected]>
+---
+ lib/tftp.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/tftp.c b/lib/tftp.c
+index ff2b7b7457..371902c0d8 100644
+--- a/lib/tftp.c
++++ b/lib/tftp.c
+@@ -545,10 +545,14 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
+     break;
+ 
+   case TFTP_EVENT_ACK: /* Connected for transmit */
++    if(!data->state.upload)
++      return CURLE_TFTP_ILLEGAL;
+     result = tftp_connect_for_tx(state, event);
+     break;
+ 
+   case TFTP_EVENT_DATA: /* Connected for receive */
++    if(data->state.upload)
++      return CURLE_TFTP_ILLEGAL;
+     result = tftp_connect_for_rx(state, event);
+     break;
+ 
+@@ -709,6 +713,9 @@ static CURLcode tftp_tx(struct tftp_state_data *state, tftp_event_t event)
+   char *bufptr;
+   bool eos;
+ 
++  if(!data->state.upload)
++    return CURLE_TFTP_ILLEGAL;
++
+   switch(event) {
+ 
+   case TFTP_EVENT_ACK:
+@@ -1131,6 +1138,8 @@ static CURLcode tftp_receive_packet(struct Curl_easy *data)
+ 
+     switch(state->event) {
+     case TFTP_EVENT_DATA:
++      if(data->state.upload)
++        return CURLE_TFTP_ILLEGAL;
+       /* Don't pass to the client empty or retransmitted packets */
+       if(state->rbytes > 4 &&
+          (NEXT_BLOCKNUM(state->block) == getrpacketblock(&state->rpacket))) {
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
index ab33d4aa77..e08ca2f930 100644
@@ -43,6 +43,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-13608.patch \
            file://CVE-2026-8286.patch \
            file://CVE-2026-80230.patch \
+           file://CVE-2026-92389.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
#12 lore raw

PATCH 11/19 curl: set CVE_STATUS for CVE-2026-19931

In reply to Fabien Thomas

From: Darsh Kelaiya <[email protected]>

Analysis:
- The advisory [1] names [2] as its fixed-in commit. It moves connection maintenance to admin handles, preserving the identity used by authentication reuse checks.
- Earlier, [4] added Negotiate/NTLM connection reuse checks, including an SSPI ambient-user check using recent_conn_id. Later, [5] removed that SSPI check; the other checks remain.
- Curl 8.7.1 predates [4]. Applying [2] alone would not reproduce the later upstream behavior; a source fix needs backport analysis.
- The advisory describes Negotiate reuse with empty credentials and lists curl 8.7.1 within the affected range [1].
- On Linux, this requires krb5 and negotiate-auth. Scarthgap enables negotiate-auth but leaves krb5 disabled by default.
- Follow the merged GSS-API configuration check in [3]. Set not-applicable-config if either option is absent; otherwise keep unpatched while the source backport is deferred.
- Record the CVE as not-applicable-config unless both required PACKAGECONFIG options are enabled; otherwise retain unpatched status. The CVE_STATUS decision is conditional, not hardcoded.

Reference:
[1] https://curl.se/docs/CVE-2026-19931.html
[2] https://github.com/curl/curl/commit/7103a93b05bc69ea98ed9d05d02fa9eeba533f2f
[3] https://github.com/openembedded/openembedded-core/commit/93c410c455b92a2b1fe3b77347e57d02f344056b
[4] https://github.com/curl/curl/commit/1a17959fc7a80864c9c9b37097856bdb4a465cf8
[5] https://github.com/curl/curl/commit/1c58877705b172da892cb9c18c5edb572f2d1d73

---
 meta/recipes-support/curl/curl_8.7.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
index e08ca2f930..4be96a6f7f 100644
@@ -65,6 +65,7 @@ CVE_STATUS[CVE-2026-8458] = "${@bb.utils.contains('PACKAGECONFIG', 'krb5 negotia
 CVE_STATUS[CVE-2026-9547] = "not-applicable-config: vulnerable libssh backend is not enabled by the recipe"
 CVE_STATUS[CVE-2026-82209] = "not-applicable-config: public suffix list support is disabled by the recipe with --without-libpsl"
 CVE_STATUS[CVE-2026-12064] = "${@bb.utils.contains('PACKAGECONFIG', 'libssh2', 'unpatched', 'not-applicable-config: SCP/SFTP support is not enabled in PACKAGECONFIG', d)}"
+CVE_STATUS[CVE-2026-19931] = "${@bb.utils.contains('PACKAGECONFIG', 'krb5 negotiate-auth', 'unpatched', 'not-applicable-config: GSS-API Negotiate is disabled', d)}"
 
 inherit autotools pkgconfig binconfig multilib_header ptest
 
#13 lore raw

PATCH 12/19 curl: fix CVE-2026-18924

In reply to Fabien Thomas

From: Darsh Kelaiya <[email protected]>

This patch applies the upstream fix as referenced in [2], using the commit shown in [1].

Make accepted HTTP/2 push handles inherit their parent's share object. Use the curl 8.7.1 share setter to retain its locking, reference counting and shared-cache handling during cleanup.

Retain curl_easy_duphandle() instead of the later creation change in [3]. In 8.7.1, duplication leaves the share and connection-cache pointers NULL. The share setter increments its use count before the push callback and multi addition; cleanup releases it. Share cleanup is blocked while this reference remains. Keep the documented inheritance of parent options.

[1] https://github.com/curl/curl/commit/90325ff0444cbdff368bda5d26d6405a0bb6ee43
[2] https://curl.se/docs/CVE-2026-18924.html
[3] https://github.com/curl/curl/commit/fad90b666df98c93ee165341b0c8101c7b10ad7b

---
 .../curl/curl/CVE-2026-18924.patch            | 56 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.7.1.bb       |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-18924.patch
meta/recipes-support/curl/curl/CVE-2026-18924.patch new file +56 -0
new file mode 100644
index 0000000000..cf8a3a6290
@@ -0,0 +1,56 @@
+From 90325ff0444cbdff368bda5d26d6405a0bb6ee43 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Wed, 5 Aug 2026 10:02:53 +0200
+Subject: [PATCH] http2: make server push transfers inherit share from
+ parent
+
+Reported-by: Stephan Zeisberg
+Closes #22488
+
+CVE: CVE-2026-18924
+Upstream-Status: Backport [https://github.com/curl/curl/commit/90325ff0444cbdff368bda5d26d6405a0bb6ee43]
+
+Backport Changes:
+- Use share.h because curl 8.7.1 does not have curl_share.h.
+- Use curl_easy_setopt(second, CURLOPT_SHARE, data->share)
+  instead of Curl_share_easy_link(), which is absent from curl 8.7.1.
+  The setter locks the share, updates its dirty counter and links
+  shared caches.
+- Retain curl_easy_duphandle() instead of the later curl_easy_init()
+  change in [1], preserving curl 8.7.1's documented push-option
+  inheritance. In 8.7.1, duplication leaves share and state.conn_cache
+  NULL. The share setter increments share->dirty before the push
+  callback and Curl_multi_add_perform(). Curl_close() drops the use
+  count on rejection or cleanup; curl_share_cleanup() refuses to free
+  a share still in use. The share lifetime fix therefore does not
+  require the later handle-creation change.
+
+[1] https://github.com/curl/curl/commit/fad90b666df98c93ee165341b0c8101c7b10ad7b
+
+(cherry picked from commit 90325ff0444cbdff368bda5d26d6405a0bb6ee43)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/http2.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/http2.c b/lib/http2.c
+index 99d7f3b0e2..694900fd8c 100644
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -47,6 +47,7 @@
+ #include "transfer.h"
+ #include "dynbuf.h"
+ #include "headers.h"
++#include "share.h"
+ /* The last 3 #include files should be in this order */
+ #include "curl_printf.h"
+ #include "curl_memory.h"
+@@ -776,6 +777,8 @@ static struct Curl_easy *h2_duphandle(struct Curl_cfilter *cf,
+       second->req.p.http = http;
+       http2_data_setup(cf, second, &second_stream);
+       second->state.priority.weight = data->state.priority.weight;
++      if(data->share)
++        (void)curl_easy_setopt(second, CURLOPT_SHARE, data->share);
+     }
+   }
+   return second;
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
index 4be96a6f7f..ab784b4d73 100644
@@ -44,6 +44,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-8286.patch \
            file://CVE-2026-80230.patch \
            file://CVE-2026-92389.patch \
+           file://CVE-2026-18924.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
#14 lore raw

PATCH 13/19 python3-urllib3: Fix CVE-2026-97687

In reply to Fabien Thomas

From: Yogita Urade <[email protected]>

This patch applies the upstream fix as referenced in [3], using the commit shown in [1] and [2].

[1]
https://github.com/urllib3/urllib3/commit/b6447295fff7b38fdffc67e0df9712d60cef3cc3
[2]
https://github.com/urllib3/urllib3/commit/07408cec79d1856d81bb42c74a904a24fdb9e465
[3] https://nvd.nist.gov/vuln/detail/CVE-2026-97687

[bajau: fixed SRC_URI indentation in the recipe file]
---
 .../python3-urllib3/CVE-2026-97687_p1.patch   | 285 +++++++++++
 .../python3-urllib3/CVE-2026-97687_p2.patch   | 482 ++++++++++++++++++
 .../python/python3-urllib3_2.2.2.bb           |   2 +
 3 files changed, 769 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p1.patch
 create mode 100644 meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p2.patch
meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p1.patch new file +285 -0
new file mode 100644
index 0000000000..241be4adaa
@@ -0,0 +1,285 @@
+From b6447295fff7b38fdffc67e0df9712d60cef3cc3 Mon Sep 17 00:00:00 2001
+From: Dustin Hoeppner <[email protected]>
+Date: Fri, 12 Jun 2026 08:27:08 -0500
+Subject: [PATCH] Fix `proxy_ssl_context` ignored for HTTPS forwarding proxies
+ (#3786)
+
+Co-authored-by: Illia Volochii <[email protected]>
+
+CVE: CVE-2026-97687
+Upstream-Status: Backport [https://github.com/urllib3/urllib3/commit/b6447295fff7b38fdffc67e0df9712d60cef3cc3]
+
+Backport Changes:
+- Shifted the upstream policy-selection block to the target method's
+  indentation so this intermediate patch applies and compiles.
+
+Signed-off-by: Yogita Urade <[email protected]>
+---
+ changelog/2577.bugfix.rst                     |   2 +
+ src/urllib3/connection.py                     |  16 +-
+ src/urllib3/poolmanager.py                    |  15 ++
+ .../test_proxy_poolmanager.py                 | 149 ++++++++++++++++--
+ 4 files changed, 165 insertions(+), 17 deletions(-)
+ create mode 100644 changelog/2577.bugfix.rst
+
+diff --git a/changelog/2577.bugfix.rst b/changelog/2577.bugfix.rst
+new file mode 100644
+index 0000000..57d7f1f
+--- /dev/null
++++ b/changelog/2577.bugfix.rst
+@@ -0,0 +1,2 @@
++Fixed usage of ``proxy_ssl_context`` with ``ProxyManager`` when ``use_forwarding_for_https=True``.
++Passing ``ssl_context`` instead of ``proxy_ssl_context`` for HTTPS proxies in this configuration now emits a ``FutureWarning`` and will raise an error in v3.0.
+diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
+index 1b16279..b9760c6 100644
+--- a/src/urllib3/connection.py
++++ b/src/urllib3/connection.py
+@@ -649,6 +649,20 @@ class HTTPSConnection(HTTPConnection):
+         # Remove trailing '.' from fqdn hostnames to allow certificate validation
+         server_hostname_rm_dot = server_hostname.rstrip(".")
+ 
++        # Forwarding proxies should use proxy SSL context for
++        # wrapping since that's the connection being established,
++        # whereas tunneling proxies should use the connection's SSL
++        # context.
++        # However, for backwards compatibility reasons, if the proxy
++        # is forwarding but no proxy SSL context is provided, we
++        # fall back to using the connection's SSL context until
++        # urllib3 v3.0. Appropriate warning is emitted in
++        # ``ProxyManager.__init__``.
++        if self.proxy_is_forwarding and self.proxy_config is not None:
++            ssl_context = self.proxy_config.ssl_context
++        else:
++            ssl_context = self.ssl_context
++
+         sock_and_verified = _ssl_wrap_socket_and_match_hostname(
+             sock=sock,
+             cert_reqs=self.cert_reqs,
+@@ -662,7 +676,7 @@ class HTTPSConnection(HTTPConnection):
+             key_file=self.key_file,
+             key_password=self.key_password,
+             server_hostname=server_hostname_rm_dot,
+-            ssl_context=self.ssl_context,
++            ssl_context=ssl_context,
+             tls_in_tls=tls_in_tls,
+             assert_hostname=self.assert_hostname,
+             assert_fingerprint=self.assert_fingerprint,
+diff --git a/src/urllib3/poolmanager.py b/src/urllib3/poolmanager.py
+index 5763fea..290cfe1 100644
+--- a/src/urllib3/poolmanager.py
++++ b/src/urllib3/poolmanager.py
+@@ -581,6 +581,21 @@ class ProxyManager(PoolManager):
+         if proxy.scheme not in ("http", "https"):
+             raise ProxySchemeUnknown(proxy.scheme)
+ 
++        if (
++            use_forwarding_for_https
++            and proxy.scheme == "https"
++            and connection_pool_kw.get("ssl_context") is not None
++        ):
++            warnings.warn(
++                "Passing ssl_context when use_forwarding_for_https=True is deprecated "
++                "and will raise an error in urllib3 v3.0. "
++                "Use proxy_ssl_context to configure the TLS connection to the proxy.",
++                FutureWarning,
++                stacklevel=2,
++            )
++            if proxy_ssl_context is None:
++                proxy_ssl_context = connection_pool_kw.get("ssl_context")
++
+         if not proxy.port:
+             port = port_by_scheme.get(proxy.scheme, 80)
+             proxy = proxy._replace(port=port)
+diff --git a/test/with_dummyserver/test_proxy_poolmanager.py b/test/with_dummyserver/test_proxy_poolmanager.py
+index a0b1172..f116b41 100644
+--- a/test/with_dummyserver/test_proxy_poolmanager.py
++++ b/test/with_dummyserver/test_proxy_poolmanager.py
+@@ -10,6 +10,7 @@ import shutil
+ import socket
+ import ssl
+ import tempfile
++import typing
+ from test import LONG_TIMEOUT, SHORT_TIMEOUT, resolvesLocalhostFQDN, withPyOpenSSL
+ from test.conftest import ServerConfig
+ 
+@@ -24,7 +25,7 @@ from dummyserver.testcase import (
+ )
+ from urllib3 import HTTPResponse
+ from urllib3._collections import HTTPHeaderDict
+-from urllib3.connection import VerifiedHTTPSConnection
++from urllib3.connection import HTTPSConnection, VerifiedHTTPSConnection
+ from urllib3.connectionpool import connection_from_url
+ from urllib3.exceptions import (
+     ConnectTimeoutError,
+@@ -165,6 +166,43 @@ class TestHTTPProxyManager(HypercornDummyProxyTestCase):
+             r = https.request("GET", f"{self.https_url}/")
+             assert r.status == 200
+ 
++    @requires_network()
++    @pytest.mark.parametrize(
++        "proxy_ssl_context_kw",
++        [
++            ("ssl_context",),
++            ("proxy_ssl_context",),
++            ("ssl_context", "proxy_ssl_context"),
++        ],
++    )
++    def test_https_proxy_forwarding_for_https_with_custom_context(
++        self, proxy_ssl_context_kw: tuple[str, ...]
++    ) -> None:
++        """
++        Test that an HTTP request succeeds when using a forwarding HTTPS
++        proxy with an SSL context provided via either
++        ``proxy_ssl_context``, ``ssl_context`` (fallback), or both.
++        """
++
++        proxy_ctx = ssl.create_default_context()
++        proxy_ctx.load_verify_locations(DEFAULT_CA)
++
++        warning_checker: contextlib.AbstractContextManager[typing.Any]
++        if "ssl_context" in proxy_ssl_context_kw:
++            warning_checker = pytest.warns(FutureWarning, match="ssl_context")
++        else:
++            warning_checker = contextlib.nullcontext()
++        with warning_checker:
++            proxy = proxy_from_url(
++                self.https_proxy_url,
++                **{kw: proxy_ctx for kw in proxy_ssl_context_kw},
++                use_forwarding_for_https=True,
++            )
++
++        with proxy:
++            resp = proxy.request("GET", self.https_url)
++            assert resp.status == 200
++
+     def test_nagle_proxy(self) -> None:
+         """Test that proxy connections do not have TCP_NODELAY turned on"""
+         with ProxyManager(self.proxy_url) as http:
+@@ -708,20 +746,8 @@ class TestHTTPProxyManager(HypercornDummyProxyTestCase):
+     # see https://github.com/python/cpython/issues/103472
+     @pytest.mark.filterwarnings("default::ResourceWarning")
+     @requires_network()
+-    @pytest.mark.parametrize(
+-        ["proxy_scheme", "use_forwarding_for_https"],
+-        [
+-            ("http", False),
+-            ("https", False),
+-            ("https", True),
+-        ],
+-    )
+-    def test_proxy_https_target_tls_error(
+-        self, proxy_scheme: str, use_forwarding_for_https: str
+-    ) -> None:
+-        if proxy_scheme == "https" and use_forwarding_for_https:
+-            pytest.skip("Test is expected to fail due to urllib3/urllib3#2577")
+-
++    @pytest.mark.parametrize("proxy_scheme", ["http", "https"])
++    def test_proxy_https_target_tls_error(self, proxy_scheme: str) -> None:
+         proxy_url = self.https_proxy_url if proxy_scheme == "https" else self.proxy_url
+         proxy_ctx = ssl.create_default_context()
+         proxy_ctx.load_verify_locations(DEFAULT_CA)
+@@ -731,12 +757,103 @@ class TestHTTPProxyManager(HypercornDummyProxyTestCase):
+             proxy_url,
+             proxy_ssl_context=proxy_ctx,
+             ssl_context=ctx,
+-            use_forwarding_for_https=use_forwarding_for_https,
+         ) as proxy:
+             with pytest.raises(MaxRetryError) as e:
+                 proxy.request("GET", self.https_url)
+             assert isinstance(e.value.reason, SSLError)
+ 
++    @requires_network()
++    def test_forwarding_proxy_tls_error_with_fallback(self) -> None:
++        """
++        Test that when only ``ssl_context`` is passed to a forwarding
++        HTTPS proxy, a ``FutureWarning`` is emitted and if the TLS
++        handshake with the proxy fails using that context, the error is
++        a ``ProxyError`` wrapping the original TLS error.
++        """
++        ctx = ssl.create_default_context()
++
++        with pytest.warns(FutureWarning, match="ssl_context"):
++            proxy = proxy_from_url(
++                self.https_proxy_url,
++                ssl_context=ctx,
++                use_forwarding_for_https=True,
++            )
++
++        with proxy:
++            with pytest.raises(MaxRetryError) as e:
++                proxy.request("GET", self.https_url)
++            assert isinstance(e.value.reason, ProxyError)
++            assert isinstance(e.value.reason.original_error, SSLError)
++
++    @requires_network()
++    def test_forwarding_proxy_ssl_context_precedence(self) -> None:
++        """
++        Test that when both ``ssl_context`` and ``proxy_ssl_context``
++        are passed to a forwarding HTTPS proxy, ``proxy_ssl_context`` is
++        used for the proxy connection and ``ssl_context`` is ignored
++        (with a warning).
++        """
++        ssl_context = ssl.create_default_context(cafile=DEFAULT_CA)
++        proxy_ssl_context = ssl.create_default_context(cafile=DEFAULT_CA)
++
++        with pytest.warns(FutureWarning, match="ssl_context"):
++            proxy = proxy_from_url(
++                self.https_proxy_url,
++                proxy_ssl_context=proxy_ssl_context,
++                ssl_context=ssl_context,
++                use_forwarding_for_https=True,
++            )
++
++        with proxy:
++            pool = proxy.connection_from_url(self.https_url)
++            with contextlib.closing(pool._new_conn()) as conn:
++                conn = typing.cast(HTTPSConnection, conn)
++                conn.connect()
++                assert isinstance(conn.sock, ssl.SSLSocket)
++                assert conn.sock.context is proxy_ssl_context
++
++    @requires_network()
++    def test_forwarding_proxy_ssl_context_fallback(self) -> None:
++        """
++        Test that when only ``ssl_context`` is passed to a forwarding
++        HTTPS proxy, a ``FutureWarning`` is emitted and ``ssl_context``
++        is used as the proxy TLS context (fallback).
++        """
++        ssl_context = ssl.create_default_context(cafile=DEFAULT_CA)
++
++        with pytest.warns(FutureWarning, match="ssl_context"):
++            proxy = proxy_from_url(
++                self.https_proxy_url,
++                ssl_context=ssl_context,
++                use_forwarding_for_https=True,
++            )
++
++        with proxy:
++            pool = proxy.connection_from_url(self.https_url)
++            with contextlib.closing(pool._new_conn()) as conn:
++                conn = typing.cast(HTTPSConnection, conn)
++                conn.connect()
++                assert isinstance(conn.sock, ssl.SSLSocket)
++                assert conn.sock.context is ssl_context
++
++    @requires_network()
++    def test_forwarding_non_https_proxy_ssl_context_fallback(self) -> None:
++        """
++        Test that when only ``ssl_context`` is passed to a forwarding
++        non-HTTPS proxy, no warning or error is emitted.
++        """
++        ssl_context = ssl.create_default_context(cafile=DEFAULT_CA)
++        # No warning/error should be emitted even when ``ssl_context``
++        # is provided to a non-HTTPS proxy for some reason.
++        proxy = proxy_from_url(
++            self.proxy_url,
++            ssl_context=ssl_context,
++            use_forwarding_for_https=True,
++        )
++        with proxy:
++            resp = proxy.request("GET", self.https_url)
++            assert resp.status == 200
++
+     # stdlib http.client.HTTPConnection._tunnel() causes a ResourceWarning
+     # see https://github.com/python/cpython/issues/103472
+     @pytest.mark.filterwarnings("default::ResourceWarning")
meta/recipes-devtools/python/python3-urllib3/CVE-2026-97687_p2.patch new file +482 -0

482 lines not on this page · raw message

meta/recipes-devtools/python/python3-urllib3_2.2.2.bb +2 -0
index 7ca210429b..95667d3fd8 100644
@@ -13,6 +13,8 @@ SRC_URI += "file://CVE-2025-50181.patch \
            file://CVE-2026-21441.patch \
            file://CVE-2026-44431.patch \
            file://CVE-2026-97689.patch \
+           file://CVE-2026-97687_p1.patch \
+           file://CVE-2026-97687_p2.patch \
            "
 
 RDEPENDS:${PN} += "\
#15 lore raw

PATCH 14/19 curl: fix CVE-2026-86409

In reply to Fabien Thomas

From: João Marcos Costa (Schneider Electric) <[email protected]>

This vulnerability, marked as High [1], was fixed upstream [2] since v8.22.0.

Backport the fix to curl v8.7.1.

The only changes not included in the backport are the ones related to test1978, which is not available in v8.7.1.

[1] https://nvd.nist.gov/vuln/detail/cve-2026-86409
[2] https://curl.se/docs/CVE-2026-86409.html

[bajau: updated the SRC_URI patch list]
---
 .../curl/curl/CVE-2026-86409.patch            | 36 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.7.1.bb       |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86409.patch
meta/recipes-support/curl/curl/CVE-2026-86409.patch new file +36 -0
new file mode 100644
index 0000000000..55a4def13b
@@ -0,0 +1,36 @@
+From 0d375942119d6a8fe6a4c6874a2f1f05d3312ad0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Marcos=20Costa?= <[email protected]>
+Date: Thu, 5 Nov 2026 17:55:56 +0100
+Subject: [PATCH] setopt: make NULL CURLOPT_AWS_SIGV4 disable aws-sigv4 auth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Disable `CURLAUTH_AWS_SIGV4` when `CURLOPT_AWS_SIGV4` is set to NULL.
+Syncing behavior with `CURLAUTH_HTTPSIG`.
+
+Reported-by: Stanislav Fort
+
+Closes #22681
+
+CVE: CVE-2026-86409
+Upstream-Status: Backport [https://github.com/curl/curl/commit/c3c70440e8d9938c0bb732595751e8aebc614f24]
+
+Signed-off-by: João Marcos Costa <[email protected]>
+---
+ lib/setopt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/setopt.c b/lib/setopt.c
+index 8a5a5d7c33..bcf41807e7 100644
+--- a/lib/setopt.c
++++ b/lib/setopt.c
+@@ -693,6 +693,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
+      */
+     if(data->set.str[STRING_AWS_SIGV4])
+       data->set.httpauth = CURLAUTH_AWS_SIGV4;
++    else
++      data->set.httpauth &= ~(uint32_t)CURLAUTH_AWS_SIGV4;
+     break;
+ #endif
+ 
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
index ab784b4d73..eade4f8d31 100644
@@ -45,6 +45,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-80230.patch \
            file://CVE-2026-92389.patch \
            file://CVE-2026-18924.patch \
+           file://CVE-2026-86409.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
#16 lore raw

PATCH 15/19 curl: fix CVE-2026-92388

In reply to Fabien Thomas

From: Adarsh Jagadish Kamini <[email protected]>

Backport patch to fix CVE-2026-92388.

References:
https://nvd.nist.gov/vuln/detail/CVE-2026-92388

Upstream fix:
https://github.com/curl/curl/commit/ba8f8a7f27a5c5e19e4ef212
https://github.com/curl/curl/commit/b85acacec9b38442741bb019bc9

Tested with ptest:
Before: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0
After: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0

---
 .../curl/curl/CVE-2026-92388-1.patch          | 151 ++++++++++++++++++
 .../curl/curl/CVE-2026-92388-2.patch          |  30 ++++
 meta/recipes-support/curl/curl_8.7.1.bb       |   2 +
 3 files changed, 183 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92388-1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92388-2.patch
meta/recipes-support/curl/curl/CVE-2026-92388-1.patch new file +151 -0
new file mode 100644
index 0000000000..1e91ab68f2
@@ -0,0 +1,151 @@
+From c6624e91bc9e8726b3cc45692ec0834650719a15 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Wed, 16 Sep 2026 15:17:37 +0200
+Subject: [PATCH] ftplistparser: no more overwriting set.write_func
+
+The entries in the 'set' struct should remain as set by the application.
+
+Closes #22969
+
+Backport notes for curl 8.7.1:
+- lib/cw-out.c: no CW_OUT_BODY_0LEN in 8.7.1; listmode handling applied
+  to CW_OUT_BODY only. Added #include "ftplistparser.h".
+- lib/ftplistparser.c: context conflict only; added Curl_ftp_listmode().
+- lib/ftplistparser.h: added Curl_ftp_listmode()/Curl_ftp_parselist
+  stubs to the existing CURL_DISABLE_FTP #else branch.
+- lib/ftp-int.h: does not exist in 8.7.1 (struct ftp_wc is in lib/ftp.h).
+  The now-unused ftp_wc.backup member is removed from lib/ftp.h instead.
+
+Assisted-by: kiro:claude-sonnet-5
+
+CVE: CVE-2026-92388
+Upstream-Status: Backport [https://github.com/curl/curl/commit/ba8f8a7f27a5c5e19e4ef212]
+Signed-off-by: Adarsh Jagadish Kamini <[email protected]>
+---
+ lib/cw-out.c        | 11 +++++++++--
+ lib/ftp.c           | 13 -------------
+ lib/ftp.h           |  5 -----
+ lib/ftplistparser.c | 10 ++++++++++
+ lib/ftplistparser.h |  5 +++++
+ 5 files changed, 24 insertions(+), 20 deletions(-)
+
+diff --git a/lib/cw-out.c b/lib/cw-out.c
+index c168837817..e1527f475e 100644
+--- a/lib/cw-out.c
++++ b/lib/cw-out.c
+@@ -32,6 +32,7 @@
+ #include "multiif.h"
+ #include "sendf.h"
+ #include "cw-out.h"
++#include "ftplistparser.h"
+ 
+ /* The last 3 #include files should be in this order */
+ #include "curl_printf.h"
+@@ -166,8 +167,14 @@ static void cw_get_writefunc(struct Curl_easy *data, cw_out_type otype,
+ {
+   switch(otype) {
+   case CW_OUT_BODY:
+-    *pwcb = data->set.fwrite_func;
+-    *pwcb_data = data->set.out;
++    if(Curl_ftp_listmode(data)) {
++      *pwcb = Curl_ftp_parselist;
++      *pwcb_data = data;
++    }
++    else {
++      *pwcb = data->set.fwrite_func;
++      *pwcb_data = data->set.out;
++    }
+     *pmax_write = CURL_MAX_WRITE_SIZE;
+     /* if we ever want buffering of BODY output, we can set `min_write`
+      * the preferred size. The default should always be to pass data
+diff --git a/lib/ftp.c b/lib/ftp.c
+index 5bbdeb0540..3ab395cee8 100644
+--- a/lib/ftp.c
++++ b/lib/ftp.c
+@@ -3949,15 +3949,6 @@ static CURLcode init_wc_data(struct Curl_easy *data)
+     goto fail;
+   }
+ 
+-  /* backup old write_function */
+-  ftpwc->backup.write_function = data->set.fwrite_func;
+-  /* parsing write function */
+-  data->set.fwrite_func = Curl_ftp_parselist;
+-  /* backup old file descriptor */
+-  ftpwc->backup.file_descriptor = data->set.out;
+-  /* let the writefunc callback know the transfer */
+-  data->set.out = data;
+-
+   infof(data, "Wildcard - Parsing started");
+   return CURLE_OK;
+ 
+@@ -3992,10 +3983,6 @@ static CURLcode wc_statemach(struct Curl_easy *data)
+       /* In this state is LIST response successfully parsed, so lets restore
+          previous WRITEFUNCTION callback and WRITEDATA pointer */
+       struct ftp_wc *ftpwc = wildcard->ftpwc;
+-      data->set.fwrite_func = ftpwc->backup.write_function;
+-      data->set.out = ftpwc->backup.file_descriptor;
+-      ftpwc->backup.write_function = ZERO_NULL;
+-      ftpwc->backup.file_descriptor = NULL;
+       wildcard->state = CURLWC_DOWNLOADING;
+ 
+       if(Curl_ftp_parselist_geterror(ftpwc->parser)) {
+diff --git a/lib/ftp.h b/lib/ftp.h
+index 977fc883b1..7e6097af8f 100644
+--- a/lib/ftp.h
++++ b/lib/ftp.h
+@@ -87,11 +87,6 @@ struct ftp_parselist_data; /* defined later in ftplistparser.c */
+ 
+ struct ftp_wc {
+   struct ftp_parselist_data *parser;
+-
+-  struct {
+-    curl_write_callback write_function;
+-    FILE *file_descriptor;
+-  } backup;
+ };
+ 
+ typedef enum {
+diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
+index 82f1ea00d3..eae799ff3b 100644
+--- a/lib/ftplistparser.c
++++ b/lib/ftplistparser.c
+@@ -361,6 +361,16 @@ static CURLcode ftp_pl_insert_finfo(struct Curl_easy *data,
+ 
+ #define MAX_FTPLIST_BUFFER 10000 /* arbitrarily set */
+ 
++/* returns TRUE if in wildcard listing mode */
++bool Curl_ftp_listmode(struct Curl_easy *data)
++{
++  if(data->state.wildcardmatch) {
++    struct WildcardData * const wildcard = data->wildcard;
++    return wildcard && (wildcard->state <= CURLWC_MATCHING);
++  }
++  return FALSE;
++}
++
+ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
+                           void *connptr)
+ {
+diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h
+index 5ba1f6a97d..115f916f60 100644
+--- a/lib/ftplistparser.h
++++ b/lib/ftplistparser.h
+@@ -27,6 +27,9 @@
+ 
+ #ifndef CURL_DISABLE_FTP
+ 
++/* returns TRUE if in wildcard listing mode */
++bool Curl_ftp_listmode(struct Curl_easy *data);
++
+ /* WRITEFUNCTION callback for parsing LIST responses */
+ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
+                           void *connptr);
+@@ -72,6 +75,8 @@ struct Curl_easy;
+ 
+ #else
+ /* FTP is disabled */
++#define Curl_ftp_listmode(x) FALSE
++#define Curl_ftp_parselist ZERO_NULL
+ #define Curl_wildcard_dtor(x)
+ #endif /* CURL_DISABLE_FTP */
+ #endif /* HEADER_CURL_FTPLISTPARSER_H */
meta/recipes-support/curl/curl/CVE-2026-92388-2.patch new file +30 -0
new file mode 100644
index 0000000000..322461d028
@@ -0,0 +1,30 @@
+From 8d0e0470e1eddf23a2d5c8f613e2a6d662a4b977 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Thu, 17 Sep 2026 14:32:52 +0200
+Subject: [PATCH] ftplistparser: only use the list parser in CURLWC_MATCHING
+ state
+
+Follow-up to ba8f8a7
+
+Closes #22985
+
+CVE: CVE-2026-92388
+Upstream-Status: Backport [https://github.com/curl/curl/commit/b85acacec9b38442741bb019bc9]
+Signed-off-by: Adarsh Jagadish Kamini <[email protected]>
+---
+ lib/ftplistparser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
+index eae799ff3b..daf7f06467 100644
+--- a/lib/ftplistparser.c
++++ b/lib/ftplistparser.c
+@@ -366,7 +366,7 @@ bool Curl_ftp_listmode(struct Curl_easy *data)
+ {
+   if(data->state.wildcardmatch) {
+     struct WildcardData * const wildcard = data->wildcard;
+-    return wildcard && (wildcard->state <= CURLWC_MATCHING);
++    return wildcard && (wildcard->state == CURLWC_MATCHING);
+   }
+   return FALSE;
+ }
meta/recipes-support/curl/curl_8.7.1.bb +2 -0
index eade4f8d31..d1df661b1a 100644
@@ -46,6 +46,8 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-92389.patch \
            file://CVE-2026-18924.patch \
            file://CVE-2026-86409.patch \
+           file://CVE-2026-92388-1.patch \
+           file://CVE-2026-92388-2.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
#17 lore raw

PATCH 16/19 curl: fix CVE-2026-87864

In reply to Fabien Thomas

From: Adarsh Jagadish Kamini <[email protected]>

Backport patch to fix CVE-2026-87864.

References:
https://nvd.nist.gov/vuln/detail/CVE-2026-87864

Upstream fix:
https://github.com/curl/curl/commit/3b547de301342b347fb3c6ea6ae797

Tested with ptest:
Before: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0
After: PASSED: 857, FAILED: 0, SKIPPED: 0, ABORTED: 0

---
 .../curl/curl/CVE-2026-87864.patch            | 52 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.7.1.bb       |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87864.patch
meta/recipes-support/curl/curl/CVE-2026-87864.patch new file +52 -0
new file mode 100644
index 0000000000..9ddfb6054c
@@ -0,0 +1,52 @@
+From 409f23eaf6c3a4573fa68db155010b4c9054601e Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <[email protected]>
+Date: Thu, 27 Aug 2026 09:47:53 +0200
+Subject: [PATCH] imap: APPEND CRLF fix
+
+Deny an APPEND operation with CRLF conversion requested as we are unable
+to predict the final upload size and APPEND requires us to announce it
+before starting the upload.
+
+The check for unknown sizes had already been there, but the crlf
+conversion that renders a known size unknown was not accounted for.
+
+Closes #22702
+
+CVE: CVE-2026-87864
+Upstream-Status: Backport [https://github.com/curl/curl/commit/3b547de301342b347fb3c6ea6ae797]
+
+Signed-off-by: Adarsh Jagadish Kamini <[email protected]>
+---
+ lib/imap.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/lib/imap.c b/lib/imap.c
+index 0e013e740a..6e4194b0cf 100644
+--- a/lib/imap.c
++++ b/lib/imap.c
+@@ -790,7 +790,6 @@ static CURLcode imap_perform_append(struct Curl_easy *data)
+       result = Curl_creader_set_mime(data, &data->set.mimepost);
+     if(result)
+       return result;
+-    data->state.infilesize = Curl_creader_client_length(data);
+   }
+   else
+ #endif
+@@ -800,9 +799,15 @@ static CURLcode imap_perform_append(struct Curl_easy *data)
+       return result;
+   }
+ 
+-  /* Check we know the size of the upload */
++  /* Check we know the size of the upload. This takes all readers
++   * into account. Especially crlf conversions which make the size
++   * unpredictable, e.g. -1. */
++  data->state.infilesize = Curl_creader_total_length(data);
+   if(data->state.infilesize < 0) {
+-    failf(data, "Cannot APPEND with unknown input file size");
++    if(data->set.crlf)
++      failf(data, "Cannot APPEND with CRLF conversion making size unknown");
++    else
++      failf(data, "Cannot APPEND with unknown input file size");
+     return CURLE_UPLOAD_FAILED;
+   }
+ 
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
index d1df661b1a..076c8756f5 100644
@@ -48,6 +48,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-86409.patch \
            file://CVE-2026-92388-1.patch \
            file://CVE-2026-92388-2.patch \
+           file://CVE-2026-87864.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
#18 lore raw

PATCH 17/19 gcc: patch CVE-2026-102010

In reply to Fabien Thomas

From: Peter Marko <[email protected]>

Pick patch referencing this CVE.

---
 meta/recipes-devtools/gcc/gcc-13.5.inc        |  1 +
 .../gcc/gcc/0028-CVE-2026-102010.patch        | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc/0028-CVE-2026-102010.patch
meta/recipes-devtools/gcc/gcc-13.5.inc +1 -0
index 13fbfa5a98..2de17a4177 100644
@@ -66,6 +66,7 @@ SRC_URI = "${BASEURI} \
            file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \
            file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \
            file://0027-Fix-gcc-vect-module-testcases.patch \
+           file://0028-CVE-2026-102010.patch \
 "
 SRC_URI[sha256sum] = "ec3df0015ed01411f91f9a9cd5b4da3070eb1222b02fadf4133c30c090399855"
 
meta/recipes-devtools/gcc/gcc/0028-CVE-2026-102010.patch new file +68 -0

68 lines not on this page · raw message

#19 lore raw

PATCH 18/19 aspell: Backport a fix to build with gcc-15/clang-19

In reply to Fabien Thomas

From: Khem Raj <[email protected]>

(From OE-Core rev: d6cb53c0773d28f57b5699125ef825936d4725d1)

---
 ...default-vector_hash-t.hpp-fix-gcc-15.patch | 42 +++++++++++++++++++
 .../recipes-support/aspell/aspell_0.60.8.1.bb |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch
meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch new file +42 -0
new file mode 100644
index 0000000000..4045e8e412
@@ -0,0 +1,42 @@
+From d45bf96b0a3556acb2c83069a78eaaac973d31b4 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <[email protected]>
+Date: Sun, 21 Jul 2024 22:01:50 +0100
+Subject: [PATCH] modules/speller/default/vector_hash-t.hpp: fix gcc-15 build
+
+Uncoming `gcc-15` added extra checks for template instantiation that is
+guaranteed to fail in
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=313afcfdabeab3e6705ac0bd1273627075be0023
+
+As a result `aspell` build now fails as:
+
+    In file included from modules/speller/default/readonly_ws.cpp:51:
+    modules/speller/default/vector_hash-t.hpp: In member function 'void aspeller::VectorHashTable<Parms>::recalc_size()':
+    modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e'
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                           ^
+    modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'; did you mean 'size'?
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                                           ^~~~~
+          |                                                           size
+
+It looks like `_size` is `size_` mis-spelling and `e` was not introduced
+here.
+Upstream-Status: Backport [https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ modules/speller/default/vector_hash-t.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/speller/default/vector_hash-t.hpp b/modules/speller/default/vector_hash-t.hpp
+index 969a80c..e4420b4 100644
+--- a/modules/speller/default/vector_hash-t.hpp
++++ b/modules/speller/default/vector_hash-t.hpp
+@@ -183,7 +183,7 @@ namespace aspeller {
+   template<class Parms>
+   void VectorHashTable<Parms>::recalc_size() {
+     size_ = 0;
+-    for (iterator i = begin(); i != this->e; ++i, ++this->_size);
++    for (iterator i = begin(), e = end(); i != e; ++i, ++size_);
+   }
+ 
+ }
meta/recipes-support/aspell/aspell_0.60.8.1.bb +2 -1
index 0ea9b063e0..43940b1e1b 100644
@@ -13,7 +13,8 @@ HOMEPAGE = "http://aspell.net/"
 LICENSE = "LGPL-2.0-only | LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \
+           file://0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch"
 SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b"
 
 PACKAGECONFIG ??= ""
#20 lore raw

PATCH 19/19 aspell: upgrade 0.60.8.1 -> 0.60.8.2

In reply to Fabien Thomas

From: Wang Mingyu <[email protected]>

0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch removed since it's included in 0.60.8.2

(From OE-Core rev: 1218499d028b5d5ee269cc4919a98fd1a9fa3f3f)
Changelog: https://github.com/GNUAspell/aspell/releases/tag/rel-0.60.8.2

---
 ...default-vector_hash-t.hpp-fix-gcc-15.patch | 42 -------------------
 ...{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} |  5 +--
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch
 rename meta/recipes-support/aspell/{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} (84%)
meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch deleted +0 -42
deleted file mode 100644
index 4045e8e412..0000000000
@@ -1,42 +0,0 @@
-From d45bf96b0a3556acb2c83069a78eaaac973d31b4 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <[email protected]>
-Date: Sun, 21 Jul 2024 22:01:50 +0100
-Subject: [PATCH] modules/speller/default/vector_hash-t.hpp: fix gcc-15 build
-
-Uncoming `gcc-15` added extra checks for template instantiation that is
-guaranteed to fail in
-  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=313afcfdabeab3e6705ac0bd1273627075be0023
-
-As a result `aspell` build now fails as:
-
-    In file included from modules/speller/default/readonly_ws.cpp:51:
-    modules/speller/default/vector_hash-t.hpp: In member function 'void aspeller::VectorHashTable<Parms>::recalc_size()':
-    modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e'
-      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
-          |                                           ^
-    modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'; did you mean 'size'?
-      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
-          |                                                           ^~~~~
-          |                                                           size
-
-It looks like `_size` is `size_` mis-spelling and `e` was not introduced
-here.
-Upstream-Status: Backport [https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041]
-Signed-off-by: Khem Raj <[email protected]>
----
- modules/speller/default/vector_hash-t.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/speller/default/vector_hash-t.hpp b/modules/speller/default/vector_hash-t.hpp
-index 969a80c..e4420b4 100644
---- a/modules/speller/default/vector_hash-t.hpp
-+++ b/modules/speller/default/vector_hash-t.hpp
-@@ -183,7 +183,7 @@ namespace aspeller {
-   template<class Parms>
-   void VectorHashTable<Parms>::recalc_size() {
-     size_ = 0;
--    for (iterator i = begin(); i != this->e; ++i, ++this->_size);
-+    for (iterator i = begin(), e = end(); i != e; ++i, ++size_);
-   }
- 
- }
meta/recipes-support/aspell/aspell_0.60.8.2.bb renamed from meta/recipes-support/aspell/aspell_0.60.8.1.bb +2 -3
similarity index 84%
rename from meta/recipes-support/aspell/aspell_0.60.8.1.bb
rename to meta/recipes-support/aspell/aspell_0.60.8.2.bb
index 43940b1e1b..5b4fab7c35 100644
@@ -13,9 +13,8 @@ HOMEPAGE = "http://aspell.net/"
 LICENSE = "LGPL-2.0-only | LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \
-           file://0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch"
-SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b"
+SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
+SRC_URI[sha256sum] = "57fe4863eae6048f72245a8575b44b718fb85ca14b9f8c0afc41b254dfd76919"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses"