Skip to contentSkip to conversation

curl: Security fixes

PATCH In review Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) 2 participants 14 messages Nov 4 – Nov 16

lore
Share & tools
lore
#0 lore raw

cover curl: Security fixes

From: Darsh Kelaiya <[email protected]>

Backport eleven security fixes to curl 8.19.0 on Wrynose and add a configuration-dependent status for CVE-2026-19931.

This series applies on top of my submitted five-patch curl v2 series, "curl: backport security fixes" [1]. Apply all five patches from that series first.

The source fixes address proxy authentication, AWS SigV4 reset, HSTS imports, control-response processing, cookie-jar loading, GnuTLS sends, IMAP APPEND, TFTP direction checks, hashed known_hosts matching and HTTP/2 push-handle share ownership.

The CVE-2026-92386 backport includes the upstream correction for serialized cookie-jar record limits. The CVE-2026-87865 backport includes the follow-up that avoids repeated known_hosts scans.

The CVE-2026-18924 fix replaces the earlier Wrynose submission [2] that failed compilation in the pull review [3]. It uses the available curl_easy_setopt() share setter with a CURLSH * cast instead of Curl_share_easy_link().

For CVE-2026-19931, record not-applicable-config if either krb5 or negotiate-auth is absent from PACKAGECONFIG. Builds enabling both options retain unpatched status pending a source backport.

[1] https://lists.openembedded.org/g/openembedded-core/message/248493
[2] https://lists.openembedded.org/g/openembedded-core/message/245495
[3] https://lists.openembedded.org/g/openembedded-core/message/246648

Darsh Kelaiya (12):
curl: fix CVE-2026-86414
curl: fix CVE-2026-86409
curl: fix CVE-2026-87862
curl: fix CVE-2026-92387
curl: fix CVE-2026-86412
curl: fix CVE-2026-92386
curl: fix CVE-2026-107928
curl: fix CVE-2026-87864
curl: fix CVE-2026-92389
curl: fix CVE-2026-87865
curl: set CVE_STATUS for CVE-2026-19931
curl: fix CVE-2026-18924

 .../curl/curl/CVE-2026-107928.patch           |  40 ++++
 .../curl/curl/CVE-2026-18924.patch            |  57 +++++
 .../curl/curl/CVE-2026-86409.patch            |  88 +++++++
 .../curl/curl/CVE-2026-86412.patch            |  34 +++
 .../curl/curl/CVE-2026-86414.patch            | 155 ++++++++++++
 .../curl/curl/CVE-2026-87862.patch            | 147 ++++++++++++
 .../curl/curl/CVE-2026-87864.patch            |  55 +++++
 .../curl/curl/CVE-2026-87865_p1.patch         | 225 ++++++++++++++++++
 .../curl/curl/CVE-2026-87865_p2.patch         |  89 +++++++
 .../curl/curl/CVE-2026-92386_p1.patch         |  33 +++
 .../curl/curl/CVE-2026-92386_p2.patch         | 146 ++++++++++++
 .../curl/curl/CVE-2026-92387.patch            |  43 ++++
 .../curl/curl/CVE-2026-92389.patch            |  56 +++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  16 ++
 14 files changed, 1184 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-107928.patch
 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-86412.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86414.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87862.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87864.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p2.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p2.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92387.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92389.patch
Signature · 1 line
2.35.6
#1 lore raw

PATCH 1/12 curl: fix CVE-2026-86414

From: Darsh Kelaiya <[email protected]>

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

Reject origin-authentication challenges during HTTP CONNECT while preserving 407 proxy authentication. Cover both the HTTP/1 and HTTP/2 tunnel implementations in curl 8.19.0.

Retain upstream test2173 with this version's receive-error result.

[1] https://github.com/curl/curl/commit/2956af6c7451029fb12c12f8166dff211f930d52
[2] https://curl.se/docs/CVE-2026-86414.html

---
 .../curl/curl/CVE-2026-86414.patch            | 155 ++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |   1 +
 2 files changed, 156 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86414.patch
meta/recipes-support/curl/curl/CVE-2026-86414.patch new file +155 -0
new file mode 100644
index 00000000000..13bf17dcc1b
@@ -0,0 +1,155 @@
+From 2956af6c7451029fb12c12f8166dff211f930d52 Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <[email protected]>
+Date: Thu, 3 Sep 2026 17:54:45 +0200
+Subject: [PATCH] HTTP-CONNECT: do not react to 401 responses
+
+When a proxy answers with a 401 on a CONNECT, ignore Authentication
+headers and fail the connect.
+
+Add test2173 to verify.
+
+Closes #22817
+
+CVE: CVE-2026-86414
+Upstream-Status: Backport [https://github.com/curl/curl/commit/2956af6c7451029fb12c12f8166dff211f930d52]
+
+Backport Changes:
+- Omitted the on_resp_header_udp() hunk: curl 8.19.0 has no separate
+  CONNECT-UDP response handler.
+- Applied the Curl_http_proxy_inspect_tunnel_response() change to
+  inspect_response() in lib/cf-h2-proxy.c, where curl 8.19.0 handles
+  HTTP/2 CONNECT responses. It uses ts->resp from the tunnel state
+  instead of upstream's resp argument.
+- Registered test2173 in the older compact TESTCASES list without
+  upstream's extra blank continuation line.
+- Changed test2173's expected error from 7 (CURLE_COULDNT_CONNECT)
+  to 56 (CURLE_RECV_ERROR). curl 8.19.0 reports this rejected CONNECT
+  as a receive error; upstream reports it as a connection failure.
+
+(cherry picked from commit 2956af6c7451029fb12c12f8166dff211f930d52)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/cf-h1-proxy.c      |  3 +--
+ lib/cf-h2-proxy.c      |  5 +---
+ tests/data/Makefile.am |  1 +
+ tests/data/test2173    | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 71 insertions(+), 6 deletions(-)
+
+diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c
+index 69e050b..fc68957 100644
+--- a/lib/cf-h1-proxy.c
++++ b/lib/cf-h1-proxy.c
+@@ -277,8 +277,7 @@ static CURLcode on_resp_header(struct Curl_cfilter *cf,
+   struct SingleRequest *k = &data->req;
+   (void)cf;
+ 
+-  if((checkprefix("WWW-Authenticate:", header) && (401 == k->httpcode)) ||
+-     (checkprefix("Proxy-authenticate:", header) && (407 == k->httpcode))) {
++  if(checkprefix("Proxy-authenticate:", header) && (407 == k->httpcode)) {
+ 
+     bool proxy = (k->httpcode == 407);
+     char *auth = Curl_copy_header_value(header);
+diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c
+index 4275e1e..719f9b8 100644
+--- a/lib/cf-h2-proxy.c
++++ b/lib/cf-h2-proxy.c
+@@ -788,10 +788,7 @@ static CURLcode inspect_response(struct Curl_cfilter *cf,
+     return CURLE_OK;
+   }
+ 
+-  if(ts->resp->status == 401) {
+-    auth_reply = Curl_dynhds_cget(&ts->resp->headers, "WWW-Authenticate");
+-  }
+-  else if(ts->resp->status == 407) {
++  if(ts->resp->status == 407) {
+     auth_reply = Curl_dynhds_cget(&ts->resp->headers, "Proxy-Authenticate");
+   }
+ 
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index e157596..95a8fe4 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -257,6 +257,7 @@ test2072 test2073 test2074 test2075 test2076 test2077 test2078 test2079 \
+ test2080 test2081 test2082 test2083 test2084 test2085 test2086 test2087 \
+ test2088 test2089 test2090 test2091 \
+ test2100 test2101 test2102 test2103 test2104 \
++test2173 \
+ \
+ test2200 test2201 test2202 test2203 test2204 test2205 \
+ \
+diff --git a/tests/data/test2173 b/tests/data/test2173
+new file mode 100644
+index 0000000..fb85f40
+--- /dev/null
++++ b/tests/data/test2173
+@@ -0,0 +1,68 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<testcase>
++<info>
++<keywords>
++HTTP
++HTTP GET
++HTTP CONNECT
++HTTP Basic auth
++proxytunnel
++</keywords>
++</info>
++# Server-side
++<reply>
++<data>
++HTTP/1.1 200 OK
++Date: Tue, 09 Nov 2010 14:49:00 GMT
++Server: test-server/fake swsclose
++Content-Type: text/html
++Funny-head: yesyes
++Content-Length: 9
++
++contents
++</data>
++<connect crlf="headers">
++HTTP/1.1 401 Tricking You
++WWW-Authenticate: Basic
++
++</connect>
++<datacheck crlf="headers">
++HTTP/1.1 401 Tricking You
++WWW-Authenticate: Basic
++
++</datacheck>
++</reply>
++
++# Client-side
++<client>
++<server>
++http
++http-proxy
++</server>
++<name>
++HTTP over proxy-tunnel with site wrong 401 response
++</name>
++<command>
++http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --anyauth
++</command>
++<features>
++proxy
++</features>
++</client>
++
++# Verify data after the test has been "shot"
++<verify>
++<proxy crlf="headers">
++CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
++Host: test.%TESTNUMBER:%HTTPPORT
++User-Agent: curl/%VERSION
++Proxy-Connection: Keep-Alive
++
++</proxy>
++<protocol crlf="headers">
++</protocol>
++<errorcode>
++56
++</errorcode>
++</verify>
++</testcase>
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index adee64a0188..9b28b9d7c98 100644
@@ -48,6 +48,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-82208.patch \
            file://CVE-2026-80230.patch \
            file://CVE-2026-80231.patch \
+           file://CVE-2026-86414.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#2 lore raw

PATCH 2/12 curl: fix CVE-2026-86409

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Clear CURLAUTH_AWS_SIGV4 when CURLOPT_AWS_SIGV4 is reset to NULL. Retain the upstream handle-reuse regression in test1978, using the existing test_setopt() helper.

[1] https://github.com/curl/curl/commit/c3c70440e8d9938c0bb732595751e8aebc614f24
[2] https://curl.se/docs/CVE-2026-86409.html

---
 .../curl/curl/CVE-2026-86409.patch            | 88 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86409.patch
meta/recipes-support/curl/curl/CVE-2026-86409.patch new file +88 -0
new file mode 100644
index 00000000000..bdfee79dc6a
@@ -0,0 +1,88 @@
+From 534252a345be58d6d1a79eee697244f27524b7d2 Mon Sep 17 00:00:00 2001
+From: Viktor Szakats <[email protected]>
+Date: Wed, 26 Aug 2026 09:41:03 +0200
+Subject: [PATCH] setopt: make NULL `CURLOPT_AWS_SIGV4` disable aws-sigv4 auth
+
+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]
+
+Backport Changes:
+- Use test_setopt() in lib1978.c instead of easy_setopt(), matching
+  the curl 8.19.0 test harness.
+
+(cherry picked from commit c3c70440e8d9938c0bb732595751e8aebc614f24)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/setopt.c            |  2 ++
+ tests/data/test1978     | 19 +++++++++++++++++++
+ tests/libtest/lib1978.c |  5 +++++
+ 3 files changed, 26 insertions(+)
+
+diff --git a/lib/setopt.c b/lib/setopt.c
+index 3603912..ae77ae8 100644
+--- a/lib/setopt.c
++++ b/lib/setopt.c
+@@ -1992,6 +1992,8 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
+      */
+     if(s->str[STRING_AWS_SIGV4])
+       s->httpauth = CURLAUTH_AWS_SIGV4;
++    else
++      s->httpauth &= ~(uint32_t)CURLAUTH_AWS_SIGV4;
+     break;
+ #endif
+   case CURLOPT_REFERER:
+diff --git a/tests/data/test1978 b/tests/data/test1978
+index 3ad4c67..8b6e6af 100644
+--- a/tests/data/test1978
++++ b/tests/data/test1978
+@@ -69,6 +69,25 @@ header-no-value:
+ header-some-no-value:
+ header-some-no-value: value
+ 
++PUT /%TESTNUMBER/testapi/test HTTP/1.1
++Host: 127.0.0.1:9000
++x-amz-meta-test: test2
++some-other-header: value
++x-amz-meta-test: test1
++duplicate-header: duplicate
++x-amz-meta-test: test3
++X-amz-meta-test2: test2
++x-amz-meta-blah: blah
++x-Amz-meta-test2: test1
++x-amz-Meta-test2: test3
++curr-header-no-colon: value
++next-header-no-colon: value
++duplicate-header: duplicate
++header-no-value:
++header-no-value:
++header-some-no-value:
++header-some-no-value: value
++
+ </protocol>
+ </verify>
+ </testcase>
+diff --git a/tests/libtest/lib1978.c b/tests/libtest/lib1978.c
+index 4f3ef11..d3f5c7d 100644
+--- a/tests/libtest/lib1978.c
++++ b/tests/libtest/lib1978.c
+@@ -91,6 +91,11 @@ static CURLcode test_lib1978(const char *URL)
+   test_setopt(curl, CURLOPT_CONNECT_TO, connect_to);
+ 
+   result = curl_easy_perform(curl);
++  if(result)
++    goto test_cleanup;
++
++  test_setopt(curl, CURLOPT_AWS_SIGV4, NULL);
++  result = curl_easy_perform(curl);
+ 
+ test_cleanup:
+ 
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index 9b28b9d7c98..be140ccc485 100644
@@ -49,6 +49,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-80230.patch \
            file://CVE-2026-80231.patch \
            file://CVE-2026-86414.patch \
+           file://CVE-2026-86409.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#3 lore raw

PATCH 3/12 curl: fix CVE-2026-87862

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Use an exact-host lookup when importing HSTS entries so a parent policy cannot suppress a child policy with a later expiry. Adapt the fix to hsts_add()/Curl_hsts() and register upstream test3109.

[1] https://github.com/curl/curl/commit/a1614c3bcf1593eb524b37792124357d97a5429c
[2] https://curl.se/docs/CVE-2026-87862.html

---
 .../curl/curl/CVE-2026-87862.patch            | 147 ++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |   1 +
 2 files changed, 148 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87862.patch
meta/recipes-support/curl/curl/CVE-2026-87862.patch new file +147 -0
new file mode 100644
index 00000000000..313b767ea86
@@ -0,0 +1,147 @@
+From a1614c3bcf1593eb524b37792124357d97a5429c Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Tue, 8 Sep 2026 09:07:13 +0200
+Subject: [PATCH] hsts: on load, only remove exact duplicates
+
+Added test3109: verify HSTS when parent+subdomain expires before child
+
+Reported-by: Stanislav Fort
+Closes #22869
+
+CVE: CVE-2026-87862
+Upstream-Status: Backport [https://github.com/curl/curl/commit/a1614c3bcf1593eb524b37792124357d97a5429c]
+
+Backport Changes:
+- Apply the exact-host lookup in curl 8.19.0's hsts_add() using
+  Curl_hsts(); upstream uses hsts_add_host_expire() and hsts_check().
+- Register test3109 in the older grouped tests/data/Makefile.am list.
+
+(cherry picked from commit a1614c3bcf1593eb524b37792124357d97a5429c)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/hsts.c             |  2 +-
+ tests/data/Makefile.am |  2 +-
+ tests/data/test3109    | 86 ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 88 insertions(+), 2 deletions(-)
+ create mode 100644 tests/data/test3109
+
+diff --git a/lib/hsts.c b/lib/hsts.c
+index 03f51f8..5ad5bd4 100644
+--- a/lib/hsts.c
++++ b/lib/hsts.c
+@@ -423,7 +423,7 @@ static CURLcode hsts_add(struct hsts *h, const char *line)
+       subdomain = TRUE;
+     }
+     /* only add it if not already present */
+-    e = Curl_hsts(h, curlx_str(&host), curlx_strlen(&host), subdomain);
++    e = Curl_hsts(h, curlx_str(&host), curlx_strlen(&host), FALSE);
+     if(!e)
+       result = hsts_create(h, curlx_str(&host), curlx_strlen(&host),
+                            subdomain, expires);
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index e157596..f39d613 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -279,7 +279,7 @@ test3016 test3017 test3018 test3019 test3020 test3021 test3022 test3023 \
+ test3024 test3025 test3026 test3027 test3028 test3029 test3030 test3031 \
+ test3032 test3033 test3034 test3035 \
+ \
+-test3100 test3101 test3102 test3103 test3104 test3105 \
++test3100 test3101 test3102 test3103 test3104 test3105 test3109 \
+ \
+ test3200 test3201 test3202 test3203 test3204 test3205 test3206 test3207 test3208 \
+ test3209 test3210 test3211 test3212 test3213 test3214 test3215 test3216 \
+diff --git a/tests/data/test3109 b/tests/data/test3109
+new file mode 100644
+index 0000000..d256a40
+--- /dev/null
++++ b/tests/data/test3109
+@@ -0,0 +1,86 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<testcase>
++<info>
++<keywords>
++HTTP
++HTTP proxy
++HSTS
++</keywords>
++</info>
++
++<reply>
++
++# we use this as response to a CONNECT
++<connect crlf="headers" nocheck="yes">
++HTTP/1.1 200 OK
++Server: fake
++
++</connect>
++
++<data nocheck="yes">
++HTTP/1.1 200 OK
++Date: Tue, 09 Nov 2010 14:49:00 GMT
++Content-Type: text/html
++Content-Length: 0
++
++</data>
++</reply>
++
++<client>
++<server>
++http
++http-proxy
++https
++</server>
++<features>
++HSTS
++proxy
++https
++Debug
++</features>
++
++# October 1, 2024
++<setenv>
++CURL_HSTS_HTTP=yes
++CURL_TIME=1727733600
++</setenv>
++
++# the child name has a later expiury than the parent so it must not be removed
++# before
++<file name="%LOGDIR/input%TESTNUMBER">
++.example.test "20241010 09:42:27"
++.child.example.test "20251010 09:42:27"
++</file>
++
++<name>
++HSTS parent expires before child
++</name>
++<command>
++-x http://%HOSTIP:%PROXYPORT http://child.example.test:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
++</command>
++<disable>
++test-duphandle
++</disable>
++</client>
++
++<verify>
++
++<stdout>
++HTTP/1.1 200 OK%CR
++Server: fake%CR
++%CR
++HTTP/1.1 200 OK
++Date: Tue, 09 Nov 2010 14:49:00 GMT
++Content-Type: text/html
++Content-Length: 0
++
++</stdout>
++
++<file name="%LOGDIR/input%TESTNUMBER" mode="text">
++# Your HSTS cache. https://curl.se/docs/hsts.html
++# This file was generated by libcurl! Edit at your own risk.
++.example.test "20241010 09:42:27"
++.child.example.test "20251010 09:42:27"
++</file>
++</verify>
++</testcase>
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index be140ccc485..3828c26f507 100644
@@ -50,6 +50,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-80231.patch \
            file://CVE-2026-86414.patch \
            file://CVE-2026-86409.patch \
+           file://CVE-2026-87862.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#4 lore raw

PATCH 4/12 curl: fix CVE-2026-92387

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Limit each Curl_pp_readresp() call to ten new socket reads so an unfinished response cannot monopolize the multi interface.

[1] https://github.com/curl/curl/commit/753735af87f5c30cb6f60a70342f8bc4bc5fd5db
[2] https://curl.se/docs/CVE-2026-92387.html

---
 .../curl/curl/CVE-2026-92387.patch            | 43 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92387.patch
meta/recipes-support/curl/curl/CVE-2026-92387.patch new file +43 -0
new file mode 100644
index 00000000000..d997aa478a3
@@ -0,0 +1,43 @@
+From 753735af87f5c30cb6f60a70342f8bc4bc5fd5db Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Sun, 13 Sep 2026 16:12:01 +0200
+Subject: [PATCH] pingpong: add a max loop counter for Curl_pp_readresp
+
+To make sure it cannot get stuck in this function.
+
+Reported-by: Joshua Rogers
+Closes #22932
+
+CVE: CVE-2026-92387
+Upstream-Status: Backport [https://github.com/curl/curl/commit/753735af87f5c30cb6f60a70342f8bc4bc5fd5db]
+
+(cherry picked from commit 753735af87f5c30cb6f60a70342f8bc4bc5fd5db)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/pingpong.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/pingpong.c b/lib/pingpong.c
+index 4ede0a5..b32651a 100644
+--- a/lib/pingpong.c
++++ b/lib/pingpong.c
+@@ -253,6 +253,7 @@ CURLcode Curl_pp_readresp(struct Curl_easy *data,
+   CURLcode result = CURLE_OK;
+   size_t gotbytes;
+   char buffer[900];
++  int maxloops = 10;
+ 
+   *code = 0; /* 0 for errors or not done */
+   *size = 0;
+@@ -270,6 +271,9 @@ CURLcode Curl_pp_readresp(struct Curl_easy *data,
+       pp->nfinal = 0; /* now gone */
+     }
+     if(!pp->overflow) {
++      if(!maxloops--) /* don't get stuck */
++        return CURLE_OK;
++
+       result = pingpong_read(data, sockindex, buffer, sizeof(buffer),
+                              &gotbytes);
+       if(result == CURLE_AGAIN)
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index 3828c26f507..c4a1167d1ba 100644
@@ -51,6 +51,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-86414.patch \
            file://CVE-2026-86409.patch \
            file://CVE-2026-87862.patch \
+           file://CVE-2026-92387.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#5 lore raw

PATCH 5/12 curl: fix CVE-2026-86412

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Ignore individual cookie parsing failures while loading a cookie file, except for out-of-memory errors. Preserve line-reading errors and the older Curl_cookie_add() call interface.

[1] https://github.com/curl/curl/commit/6ded3e594455d6f018fab5f2f5d916eb9bc4ef94
[2] https://curl.se/docs/CVE-2026-86412.html

---
 .../curl/curl/CVE-2026-86412.patch            | 34 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86412.patch
meta/recipes-support/curl/curl/CVE-2026-86412.patch new file +34 -0
new file mode 100644
index 00000000000..2a846fdbed5
@@ -0,0 +1,34 @@
+From 6ded3e594455d6f018fab5f2f5d916eb9bc4ef94 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Sat, 5 Sep 2026 16:08:55 +0200
+Subject: [PATCH] cookie: ignore individual cookie errors when loading
+
+Closes #22840
+
+CVE: CVE-2026-86412
+Upstream-Status: Backport [https://github.com/curl/curl/commit/6ded3e594455d6f018fab5f2f5d916eb9bc4ef94]
+
+(cherry picked from commit 6ded3e594455d6f018fab5f2f5d916eb9bc4ef94)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/cookie.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/cookie.c b/lib/cookie.c
+index a8959a6..8d9acf1 100644
+--- a/lib/cookie.c
++++ b/lib/cookie.c
+@@ -1130,8 +1130,9 @@ static CURLcode cookie_load(struct Curl_easy *data, const char *file,
+ 
+         result = Curl_cookie_add(data, ci, headerline, TRUE, lineptr, NULL,
+                                  NULL, TRUE);
+-        /* File reading cookie failures are not propagated back to the
+-           caller because there is no way to do that */
++        /* Ignore individual cookie problems unless we ran out of memory */
++        if(result != CURLE_OUT_OF_MEMORY)
++          result = CURLE_OK;
+       }
+     } while(!result && !eof);
+     curlx_dyn_free(&buf); /* free the line buffer */
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index c4a1167d1ba..7749c1907f9 100644
@@ -52,6 +52,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-86409.patch \
            file://CVE-2026-87862.patch \
            file://CVE-2026-92387.patch \
+           file://CVE-2026-86412.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#6 lore raw

PATCH 6/12 curl: fix CVE-2026-92386

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Include the upstream correction [3] to accept every cookie-jar record that curl can serialize. The original MAX_COOKIE_LINE + 48 allowance is too small for long paths and domains. Keep both commits in separate patches and include the test1902/lib1902.c regression coverage.

[1] https://github.com/curl/curl/commit/445aa87e13f91c94bc742f54343a2eac924e1765
[2] https://curl.se/docs/CVE-2026-92386.html
[3] https://github.com/curl/curl/commit/7d64440abba37e3d8039fe663d3edc84f582ce92

---
 .../curl/curl/CVE-2026-92386_p1.patch         |  33 ++++
 .../curl/curl/CVE-2026-92386_p2.patch         | 146 ++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |   2 +
 3 files changed, 181 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p2.patch
meta/recipes-support/curl/curl/CVE-2026-92386_p1.patch new file +33 -0
new file mode 100644
index 00000000000..69fcedd4faf
@@ -0,0 +1,33 @@
+From 445aa87e13f91c94bc742f54343a2eac924e1765 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Wed, 16 Sep 2026 11:09:18 +0200
+Subject: [PATCH] cookie: accept slightly longer lines in cookie jars
+
+Closes #22964
+
+CVE: CVE-2026-92386
+Upstream-Status: Backport [https://github.com/curl/curl/commit/445aa87e13f91c94bc742f54343a2eac924e1765]
+
+(cherry picked from commit 445aa87e13f91c94bc742f54343a2eac924e1765)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/cookie.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/cookie.c b/lib/cookie.c
+index 8d9acf1..b88ff56 100644
+--- a/lib/cookie.c
++++ b/lib/cookie.c
+@@ -1115,7 +1115,9 @@ static CURLcode cookie_load(struct Curl_easy *data, const char *file,
+   if(fp) {
+     struct dynbuf buf;
+     bool eof = FALSE;
+-    curlx_dyn_init(&buf, MAX_COOKIE_LINE);
++    /* accept a little longer lines so that a full cookie fits and does not
++       abort the file read */
++    curlx_dyn_init(&buf, MAX_COOKIE_LINE + 48);
+     do {
+       result = Curl_get_line(&buf, fp, &eof);
+       if(!result) {
+-- 
+2.35.6
meta/recipes-support/curl/curl/CVE-2026-92386_p2.patch new file +146 -0

146 lines not on this page · raw message

meta/recipes-support/curl/curl_8.19.0.bb +2 -0
index 7749c1907f9..3e804a26f3a 100644
@@ -53,6 +53,8 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-87862.patch \
            file://CVE-2026-92387.patch \
            file://CVE-2026-86412.patch \
+           file://CVE-2026-92386_p1.patch \
+           file://CVE-2026-92386_p2.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#7 lore raw

PATCH 7/12 curl: fix CVE-2026-107928

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Reject a GnuTLS send result larger than the supplied buffer before advancing the buffer pointer or subtracting the remaining length. The advisory's trigger requires GnuTLS and WebSockets.

[1] https://github.com/curl/curl/commit/64fb3e7a7b116f690966054f281624152d4a7651
[2] https://curl.se/docs/CVE-2026-107928.html

---
 .../curl/curl/CVE-2026-107928.patch           | 40 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-107928.patch
meta/recipes-support/curl/curl/CVE-2026-107928.patch new file +40 -0
new file mode 100644
index 00000000000..67f66f097ca
@@ -0,0 +1,40 @@
+From 64fb3e7a7b116f690966054f281624152d4a7651 Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <[email protected]>
+Date: Wed, 7 Oct 2026 11:22:39 +0200
+Subject: [PATCH] gnutls: hardening
+
+Check the result code of `gnutls_record_send()` for sanity also in
+production builds.
+
+Closes #23297
+
+CVE: CVE-2026-107928
+Upstream-Status: Backport [https://github.com/curl/curl/commit/64fb3e7a7b116f690966054f281624152d4a7651]
+
+(cherry picked from commit 64fb3e7a7b116f690966054f281624152d4a7651)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/vtls/gtls.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
+index f19940a..b87b27d 100644
+--- a/lib/vtls/gtls.c
++++ b/lib/vtls/gtls.c
+@@ -2064,8 +2064,13 @@ static CURLcode gtls_send(struct Curl_cfilter *cf,
+     nwritten = gnutls_record_send(backend->gtls.session, buf, remain);
+ 
+     if(nwritten >= 0) {
++      if((size_t)nwritten > remain) {
++        DEBUGASSERT(0);
++        failf(data, "gnutls_record_send(len=%zu) returned %zd",
++              remain, nwritten);
++        return CURLE_SEND_ERROR;
++      }
+       *pnwritten += (size_t)nwritten;
+-      DEBUGASSERT((size_t)nwritten <= remain);
+       buf = (char *)CURL_UNCONST(buf) + (size_t)nwritten;
+       remain -= (size_t)nwritten;
+     }
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index 3e804a26f3a..9a85d470dc5 100644
@@ -55,6 +55,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-86412.patch \
            file://CVE-2026-92386_p1.patch \
            file://CVE-2026-92386_p2.patch \
+           file://CVE-2026-107928.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#8 lore raw

PATCH 8/12 curl: fix CVE-2026-87864

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Determine the IMAP APPEND length after configuring all upload readers. Reject uploads whose final length becomes unknown because of CRLF conversion before sending the APPEND command.

[1] https://github.com/curl/curl/commit/3b547de301342b347fb3c6ea6ae7979070793a66
[2] https://curl.se/docs/CVE-2026-87864.html

---
 .../curl/curl/CVE-2026-87864.patch            | 55 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87864.patch
meta/recipes-support/curl/curl/CVE-2026-87864.patch new file +55 -0
new file mode 100644
index 00000000000..0effc5ac8ac
@@ -0,0 +1,55 @@
+From 3b547de301342b347fb3c6ea6ae7979070793a66 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/3b547de301342b347fb3c6ea6ae7979070793a66]
+
+(cherry picked from commit 3b547de301342b347fb3c6ea6ae7979070793a66)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/imap.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/lib/imap.c b/lib/imap.c
+index 0546595..f37568f 100644
+--- a/lib/imap.c
++++ b/lib/imap.c
+@@ -884,7 +884,6 @@ static CURLcode imap_perform_append(struct Curl_easy *data,
+       result = Curl_creader_set_mime(data, postp);
+     if(result)
+       return result;
+-    data->state.infilesize = Curl_creader_client_length(data);
+   }
+   else
+ #endif
+@@ -894,9 +893,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;
+   }
+ 
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index 9a85d470dc5..e039207a0e4 100644
@@ -56,6 +56,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-92386_p1.patch \
            file://CVE-2026-92386_p2.patch \
            file://CVE-2026-107928.patch \
+           file://CVE-2026-87864.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#9 lore raw

PATCH 9/12 curl: fix CVE-2026-92389

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Reject TFTP packets and state transitions that conflict with the requested transfer direction. This prevents a download from using a reused handle's upload callback or data.

[1] https://github.com/curl/curl/commit/63dd390fab905a239a97e2700532929343ebc4e9
[2] https://curl.se/docs/CVE-2026-92389.html

---
 .../curl/curl/CVE-2026-92389.patch            | 56 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92389.patch
meta/recipes-support/curl/curl/CVE-2026-92389.patch new file +56 -0
new file mode 100644
index 00000000000..adbf62e94ab
@@ -0,0 +1,56 @@
+From 44d91a58fabd1de3555e669e12d88040844be716 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
+
+CVE: CVE-2026-92389
+Upstream-Status: Backport [https://github.com/curl/curl/commit/63dd390fab905a239a97e2700532929343ebc4e9]
+
+(cherry picked from commit 63dd390fab905a239a97e2700532929343ebc4e9)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/tftp.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/tftp.c b/lib/tftp.c
+index cc0769b..fca77b7 100644
+--- a/lib/tftp.c
++++ b/lib/tftp.c
+@@ -361,6 +361,9 @@ static CURLcode tftp_tx(struct tftp_conn *state, tftp_event_t event)
+   char *bufptr;
+   bool eos;
+ 
++  if(!data->state.upload)
++    return CURLE_TFTP_ILLEGAL;
++
+   switch(event) {
+ 
+   case TFTP_EVENT_ACK:
+@@ -768,10 +771,14 @@ static CURLcode tftp_send_first(struct tftp_conn *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;
+ 
+@@ -1074,6 +1081,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;
+       /* Do not pass to the client empty or retransmitted packets */
+       if(state->rbytes > 4 &&
+          (NEXT_BLOCKNUM(state->block) == getrpacketblock(&state->rpacket))) {
+-- 
+2.35.6
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index e039207a0e4..6cf6e328272 100644
@@ -57,6 +57,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-92386_p2.patch \
            file://CVE-2026-107928.patch \
            file://CVE-2026-87864.patch \
+           file://CVE-2026-92389.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.35.6
#10 lore raw

PATCH 10/12 curl: fix CVE-2026-87865

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

From: Darsh Kelaiya <[email protected]>

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

Match hashed known_hosts entries against the requested host before selecting the host-key algorithm. Adapt the connection fields and SSH test fixture to curl 8.19.0.

Include the upstream follow-up [3] to cache key types already absent for this host, avoiding repeated full-file scans introduced by [1]. Keep both upstream commits in separate patches and retain test3500.

Install test3500.pl into ptest so the hashed-host regression can run from the target package.

[1] https://github.com/curl/curl/commit/323c184b6bdf5b1988a10c0a61560666e1588149
[2] https://curl.se/docs/CVE-2026-87865.html
[3] https://github.com/curl/curl/commit/dc055e8a9eefe65cf63cb0396668a37c0b7c474a

---
 .../curl/curl/CVE-2026-87865_p1.patch         | 225 ++++++++++++++++++
 .../curl/curl/CVE-2026-87865_p2.patch         |  89 +++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |   4 +
 3 files changed, 318 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p2.patch
meta/recipes-support/curl/curl/CVE-2026-87865_p1.patch new file +225 -0
new file mode 100644
index 00000000000..52cdd65e200
@@ -0,0 +1,225 @@
+From 323c184b6bdf5b1988a10c0a61560666e1588149 Mon Sep 17 00:00:00 2001
+From: Bobbeh Rhino <[email protected]>
+Date: Tue, 8 Sep 2026 06:33:27 -0400
+Subject: [PATCH] libssh2: match hashed known_hosts entries by host
+
+libssh2 does not expose the plaintext name for hashed entries. Check
+each entry key against the requested hostname before using its key type.
+Otherwise an unrelated hashed entry can select the wrong algorithm.
+
+Add an SFTP regression test 3500 with an unrelated hashed entry before
+the requested host.
+
+Closes #22874
+
+CVE: CVE-2026-87865
+Upstream-Status: Backport [https://github.com/curl/curl/commit/323c184b6bdf5b1988a10c0a61560666e1588149]
+
+Backport Changes:
+- Use curl 8.19.0's conn->host.name and conn->remote_port instead of
+  conn->origin->hostname and conn->origin->port. The older connection
+  has no origin pointer; preserve the -1 lookup port for port 22.
+- Register test3500 and test3500.pl in the older grouped TESTCASES
+  and EXTRA_DIST lists.
+- Use curl_host_rsa_key.pub in test3500's precheck; curl 8.19.0
+  generates that filename rather than the newer curl_host_key.pub.
+
+(cherry picked from commit 323c184b6bdf5b1988a10c0a61560666e1588149)
+Signed-off-by: Darsh Kelaiya <[email protected]>
+---
+ lib/vssh/libssh2.c        | 16 +++++++--
+ tests/data/Makefile.am    |  2 ++
+ tests/data/test3500       | 47 +++++++++++++++++++++++++
+ tests/libtest/Makefile.am |  3 +-
+ tests/libtest/test3500.pl | 72 +++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 136 insertions(+), 4 deletions(-)
+ create mode 100644 tests/data/test3500
+ create mode 100755 tests/libtest/test3500.pl
+
+diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
+index 3c25fe7..7c18ff4 100644
+--- a/lib/vssh/libssh2.c
++++ b/lib/vssh/libssh2.c
+@@ -654,9 +654,19 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data,
+             break;
+           }
+         }
+-        else {
+-          found = TRUE;
+-          break;
++        else if(store->key) {
++          int keycheck = libssh2_knownhost_checkp(
++            sshc->kh, conn->host.name,
++            (conn->remote_port != PORT_SSH) ? conn->remote_port : -1,
++            store->key, strlen(store->key),
++            LIBSSH2_KNOWNHOST_TYPE_PLAIN |
++              LIBSSH2_KNOWNHOST_KEYENC_BASE64 |
++              (store->typemask & LIBSSH2_KNOWNHOST_KEY_MASK),
++            NULL);
++          if(keycheck == LIBSSH2_KNOWNHOST_CHECK_MATCH) {
++            found = TRUE;
++            break;
++          }
+         }
+       }
+     }
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index 9fd7ee7..7a9b8d0 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -287,6 +287,8 @@ test3209 test3210 test3211 test3212 test3213 test3214 test3215 test3216 \
+ \
+ test3303 test3304 \
+ \
++test3500 \
++\
+ test4000 test4001
+ 
+ EXTRA_DIST = $(TESTCASES) DISABLED data-xml1 data320.html \
+diff --git a/tests/data/test3500 b/tests/data/test3500
+new file mode 100644
+index 0000000..86f0c43
+--- /dev/null
++++ b/tests/data/test3500
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<testcase>
++<info>
++<keywords>
++SFTP
++known_hosts
++libssh2
++</keywords>
++</info>
++
++# Server-side
++<reply>
++<data>
++Test data
++for hashed known hosts
++</data>
++</reply>
++
++# Client-side
++<client>
++<server>
++sftp
++</server>
++<features>
++sftp
++libssh2
++!badlibssh
++</features>
++<precheck>
++%PERL %SRCDIR/libtest/test3500.pl %LOGDIR/server/curl_host_rsa_key.pub %LOGDIR/known%TESTNUMBER "[%HOSTIP]:%SSHPORT"
++</precheck>
++<name>
++SFTP matches requested hashed known_hosts entry
++</name>
++<command>
++--knownhosts %LOGDIR/known%TESTNUMBER --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt
++</command>
++<file name="%LOGDIR/file%TESTNUMBER.txt">
++Test data
++for hashed known hosts
++</file>
++</client>
++
++# Verify data after the test has been "shot"
++<verify>
++</verify>
++</testcase>
+diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
+index e174698..82dbc62 100644
+--- a/tests/libtest/Makefile.am
++++ b/tests/libtest/Makefile.am
+@@ -44,7 +44,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
+ include Makefile.inc
+ 
+ EXTRA_DIST = CMakeLists.txt $(FIRST_C) $(FIRST_H) $(UTILS_C) $(UTILS_H) $(TESTS_C) \
+-  test307.pl test610.pl test613.pl test1013.pl test1022.pl mk-lib1521.pl
++  test307.pl test610.pl test613.pl test1013.pl test1022.pl mk-lib1521.pl \
++  test3500.pl
+ 
+ CFLAGS += @CURL_CFLAG_EXTRAS@
+ 
+diff --git a/tests/libtest/test3500.pl b/tests/libtest/test3500.pl
+new file mode 100755
+index 0000000..d95f54c
+--- /dev/null
++++ b/tests/libtest/test3500.pl
+@@ -0,0 +1,72 @@
++#!/usr/bin/env perl
++#***************************************************************************
++#                                  _   _ ____  _
++#  Project                     ___| | | |  _ \| |
++#                             / __| | | | |_) | |
++#                            | (__| |_| |  _ <| |___
++#                             \___|\___/|_| \_\_____|
++#
++# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
++#
++# This software is licensed as described in the file COPYING, which
++# you should have received as part of this distribution. The terms
++# are also available at https://curl.se/docs/copyright.html.
++#
++# You may opt to use, copy, modify, merge, publish, distribute and/or sell
++# copies of the Software, and permit persons to whom the Software is
++# furnished to do so, under the terms of the COPYING file.
++#
++# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
++# KIND, either express or implied.
++#
++# SPDX-License-Identifier: curl
++#
++###########################################################################
++use strict;
++use warnings;
++
++use Digest::SHA qw(hmac_sha1);
++use MIME::Base64 qw(encode_base64);
++
++sub errout {
++    print $_[0] . "\n";
++    exit 1;
++}
++
++if(@ARGV != 3) {
++    errout "Usage: $0 host-public-key known-hosts-file target";
++}
++
++my ($hostkey_file, $knownhosts_file, $target) = @ARGV;
++open(my $hostkey, "<", $hostkey_file) or errout "$!";
++my $hostkey_line = <$hostkey>;
++close($hostkey) or errout "$!";
++
++my ($hostkey_algo, $hostkey_data) = split(/\s+/, $hostkey_line);
++if(!$hostkey_algo || !$hostkey_data) {
++    errout "Failed parsing SSH host public key";
++}
++
++my $rsa_key =
++    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgSyqrUP2xhqLqkyopVapoKeucYIp" .
++    "ZXeUqj+Q9WLWyXka5re62Y3R/lxZUXtkJjlpdD2LNMFenNlDQvPaXH5Utllt+c3z" .
++    "wOkOLy7RXX5S37SfQFm/0fPkZqoZfMDB6XDcwA4cakjCRn4oZyKs8dWAxoNaTtYc" .
++    "nKKMJ6rmc8PttykJw9fwiKAjPyYf21/BMvWIzu9req+TrDA/Jcd2UAug94CikJIX" .
++    "uwKmSYleAOo4eJWx8GyujgEgZn05eq+K1LSg9RqRVIxOdqjoE5K3abBfs0rmUuLd" .
++    "MFh7nHseTFXYbKzpz46V7iZMfFuoyURrzVsqGUm+/m7dxBM98In12kOm3";
++my $ed25519_key =
++    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAqmXRY8k+W9GtpWxYru6ELAXYHdXq" .
++    "jf33ziITGTiJUN";
++my $other_key = $hostkey_algo eq "ssh-ed25519" ? $rsa_key : $ed25519_key;
++
++my $salt = "curl-knownhosts-test";
++my $salt64 = encode_base64($salt, "");
++my $hash64 = encode_base64(hmac_sha1("unrelated.invalid", $salt), "");
++my $target_hash64 = encode_base64(hmac_sha1($target, $salt), "");
++
++open(my $knownhosts, ">", $knownhosts_file) or errout "$!";
++print $knownhosts "|1|$salt64|$hash64 $other_key\n";
++print $knownhosts "|1|$salt64|$target_hash64 $hostkey_algo $hostkey_data\n";
++close($knownhosts) or errout "$!";
++
++exit 0;
+-- 
+2.35.6
meta/recipes-support/curl/curl/CVE-2026-87865_p2.patch new file +89 -0

89 lines not on this page · raw message

meta/recipes-support/curl/curl_8.19.0.bb +4 -0
index 6cf6e328272..f2de4dfa042 100644
@@ -58,6 +58,8 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-107928.patch \
            file://CVE-2026-87864.patch \
            file://CVE-2026-92389.patch \
+           file://CVE-2026-87865_p1.patch \
+           file://CVE-2026-87865_p2.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
@@ -172,6 +174,8 @@ do_install_ptest() {
 	cp ${S}/tests/*.p[lmy] ${D}${PTEST_PATH}/tests/
 
 	install -d ${D}${PTEST_PATH}/tests/libtest
+	install -m 0755 ${S}/tests/libtest/test3500.pl \
+		${D}${PTEST_PATH}/tests/libtest/
 	for name in $(makefile-getvar ${B}/tests/libtest/Makefile noinst_PROGRAMS noinst_LTLIBRARIES); do
 		${B}/libtool --mode=install install ${B}/tests/libtest/$name ${D}${PTEST_PATH}/tests/libtest
 	done
Signature · 1 line
2.35.6
#11 lore raw

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

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

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.19.0 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.19.0 within the affected range [1].
- On Linux, this requires krb5 and negotiate-auth. Wrynose enables negotiate-auth but leaves krb5 disabled by default [3].
- 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.19.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index f2de4dfa042..f30750a6061 100644
@@ -77,6 +77,7 @@ CVE_STATUS[CVE-2026-9547] = "not-applicable-config: vulnerable libssh backend is
 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-8458] = "${@bb.utils.contains('PACKAGECONFIG', 'krb5 negotiate-auth', 'unpatched', 'not-applicable-config: applicable only with GSS-API-backed Negotiate authentication', d)}"
 CVE_STATUS[CVE-2026-82209] = "not-applicable-config: public suffix list support is disabled by the recipe with --without-libpsl"
+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
 
Signature · 1 line
2.35.6
#12 lore raw

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

In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)

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.19.0 share setter to retain its locking, reference counting and shared-cache handling during cleanup.

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

---
 .../curl/curl/CVE-2026-18924.patch            | 57 +++++++++++++++++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-18924.patch
meta/recipes-support/curl/curl/CVE-2026-18924.patch new file +57 -0
new file mode 100644
index 00000000000..5d744138fa6
@@ -0,0 +1,57 @@
+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 curl_easy_setopt(second, CURLOPT_SHARE, (CURLSH *)data->share)
+  instead of Curl_share_easy_link(), which is absent from curl 8.19.0.
+  The cast satisfies curl's CURLOPT_SHARE type check. 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.19.0's documented push-option
+  inheritance. In 8.19.0, duplication leaves second->share NULL.
+  The share setter increments share->dirty before the push callback.
+  When the pushed transfer joins the multi handle, conncache.c
+  selects data->share->cpool when connection sharing is enabled.
+  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 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 e1c5798..ffeb0f4 100644
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -46,6 +46,7 @@
+ #include "bufref.h"
+ #include "curlx/dynbuf.h"
+ #include "headers.h"
++#include "curl_share.h"
+ 
+ #if (NGHTTP2_VERSION_NUM < 0x010c00)
+ #error too old nghttp2 version, upgrade!
+@@ -709,6 +710,8 @@ static struct Curl_easy *h2_duphandle(struct Curl_cfilter *cf,
+     struct h2_stream_ctx *second_stream;
+     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, (CURLSH *)data->share);
+   }
+   return second;
+ }
meta/recipes-support/curl/curl_8.19.0.bb +1 -0
index f30750a6061..f9cc46fdc32 100644
@@ -38,6 +38,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
            file://CVE-2026-80229.patch \
            file://CVE-2026-9546-01.patch \
            file://CVE-2026-9546-02.patch \
+           file://CVE-2026-18924.patch \
            file://CVE-2026-8926-dependent.patch \
            file://CVE-2026-8926_p1.patch \
            file://CVE-2026-8926_p2.patch \
Signature · 1 line
2.35.6
#13 lore raw
In reply to Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
Quoted 65 lines · On Wed Nov 4, 2026 at 8:36 AM CET, Darsh Kelaiya -X (dkelaiya - E INFOCHIPS…

From: Darsh Kelaiya <[email protected]>

Backport eleven security fixes to curl 8.19.0 on Wrynose and add a configuration-dependent status for CVE-2026-19931.

This series applies on top of my submitted five-patch curl v2 series, "curl: backport security fixes" [1]. Apply all five patches from that series first.

The source fixes address proxy authentication, AWS SigV4 reset, HSTS imports, control-response processing, cookie-jar loading, GnuTLS sends, IMAP APPEND, TFTP direction checks, hashed known_hosts matching and HTTP/2 push-handle share ownership.

The CVE-2026-92386 backport includes the upstream correction for serialized cookie-jar record limits. The CVE-2026-87865 backport includes the follow-up that avoids repeated known_hosts scans.

The CVE-2026-18924 fix replaces the earlier Wrynose submission [2] that failed compilation in the pull review [3]. It uses the available curl_easy_setopt() share setter with a CURLSH * cast instead of Curl_share_easy_link().

For CVE-2026-19931, record not-applicable-config if either krb5 or negotiate-auth is absent from PACKAGECONFIG. Builds enabling both options retain unpatched status pending a source backport.

[1] https://lists.openembedded.org/g/openembedded-core/message/248493
[2] https://lists.openembedded.org/g/openembedded-core/message/245495
[3] https://lists.openembedded.org/g/openembedded-core/message/246648

Darsh Kelaiya (12):
curl: fix CVE-2026-86414
curl: fix CVE-2026-86409
curl: fix CVE-2026-87862
curl: fix CVE-2026-92387
curl: fix CVE-2026-86412
curl: fix CVE-2026-92386
curl: fix CVE-2026-107928
curl: fix CVE-2026-87864
curl: fix CVE-2026-92389
curl: fix CVE-2026-87865
curl: set CVE_STATUS for CVE-2026-19931
curl: fix CVE-2026-18924

 .../curl/curl/CVE-2026-107928.patch           |  40 ++++
 .../curl/curl/CVE-2026-18924.patch            |  57 +++++
 .../curl/curl/CVE-2026-86409.patch            |  88 +++++++
 .../curl/curl/CVE-2026-86412.patch            |  34 +++
 .../curl/curl/CVE-2026-86414.patch            | 155 ++++++++++++
 .../curl/curl/CVE-2026-87862.patch            | 147 ++++++++++++
 .../curl/curl/CVE-2026-87864.patch            |  55 +++++
 .../curl/curl/CVE-2026-87865_p1.patch         | 225 ++++++++++++++++++
 .../curl/curl/CVE-2026-87865_p2.patch         |  89 +++++++
 .../curl/curl/CVE-2026-92386_p1.patch         |  33 +++
 .../curl/curl/CVE-2026-92386_p2.patch         | 146 ++++++++++++
 .../curl/curl/CVE-2026-92387.patch            |  43 ++++
 .../curl/curl/CVE-2026-92389.patch            |  56 +++++
 meta/recipes-support/curl/curl_8.19.0.bb      |  16 ++
 14 files changed, 1184 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-107928.patch
 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-86412.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-86414.patch
Quoted 8 lines
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87862.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87864.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865_p2.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p1.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386_p2.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92387.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92389.patch

Hello,

I think there are a few issues with this series:
- patches 01, 03-07, 10/12 are needed for blacksail but no backport was sent for them (I don't think the curl upgrade master did is OK for stable)
- 8/12 is a duplicate of an earlier patch
https://patchwork.yoctoproject.org/project/oe-core/patch/[email protected]/
- 9/12 is a duplicate of an earlier patch
https://patchwork.yoctoproject.org/project/oe-core/patch/[email protected]/
- for both I plan to continue with the earlier patch, please review/compare it with yours to spot issues.
- I took 02, 11, 12/12 patches into my review series.

Please shout if you disagree with the above

For reference, patch number <-> CVE:
[wrynose,01/12] curl: fix CVE-2026-86414 [wrynose,02/12] curl: fix CVE-2026-86409 [wrynose,03/12] curl: fix CVE-2026-87862 [wrynose,04/12] curl: fix CVE-2026-92387 [wrynose,05/12] curl: fix CVE-2026-86412 [wrynose,06/12] curl: fix CVE-2026-92386 [wrynose,07/12] curl: fix CVE-2026-107928 [wrynose,08/12] curl: fix CVE-2026-87864 [wrynose,09/12] curl: fix CVE-2026-92389 [wrynose,10/12] curl: fix CVE-2026-87865 [wrynose,11/12] curl: set CVE_STATUS for CVE-2026-19931 [wrynose,12/12] curl: fix CVE-2026-18924

Regards,

Signature · 2 lines
Yoann Congal
Smile ECS