From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" <devanshp@cisco.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-Core][scarthgap][PATCH 3/4] curl: Fix CVE-2026-6429
Date: Fri, 20 Nov 2026 05:04:13 -0800 [thread overview]
Message-ID: <20261120130414.822854-4-devanshp@cisco.com> (raw)
In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com>
From: Devansh Patel <devanshp@cisco.com>
This patch applies the upstream fix commit as referenced in [1],
and the public CVE advisory is referenced in [2].
[1] https://github.com/curl/curl/commit/b4024bf808bd558026fdc6096e8457f199ace306
[2] https://curl.se/docs/CVE-2026-6429.html
[3] https://www.cve.org/CVERecord?id=CVE-2026-6429
Signed-off-by: Devansh Patel <devanshp@cisco.com>
---
.../curl/curl/CVE-2026-6429_p1.patch | 205 ++++++++++++++++++
.../curl/curl/CVE-2026-6429_p2.patch | 52 +++++
.../curl/curl/CVE-2026-6429_p3.patch | 29 +++
meta/recipes-support/curl/curl_8.7.1.bb | 3 +
4 files changed, 289 insertions(+)
create mode 100644 meta/recipes-support/curl/curl/CVE-2026-6429_p1.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2026-6429_p2.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2026-6429_p3.patch
diff --git a/meta/recipes-support/curl/curl/CVE-2026-6429_p1.patch b/meta/recipes-support/curl/curl/CVE-2026-6429_p1.patch
new file mode 100644
index 0000000..6b195dc
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2026-6429_p1.patch
@@ -0,0 +1,205 @@
+From ad29c80f3afaffd4ee3c902e30e331eb3667b809 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 16 Apr 2026 14:26:20 +0200
+Subject: [PATCH] http: clear credentials better on redirect
+
+Verify with test 2506: netrc with redirect using proxy
+
+Updated test 998 which was wrong.
+
+Reported-by: Muhamad Arga Reksapati
+
+Closes #21345
+
+CVE: CVE-2026-6429
+Upstream-Status: Backport [https://github.com/curl/curl/commit/b4024bf808bd558026fdc6096e8457f199ace306]
+
+Backport Changes:
+- Apply Curl_http_follow changes to Curl_follow in lib/transfer.c,
+ where 8.7.1 implements redirects. Use its newurl/state.url strings
+ and free/Curl_safefree names instead of the newer buffer API.
+- Fold in only the required Curl_url_same_origin helper and declaration
+ from upstream prerequisite 32a513e180ce83d5e9b708211306045407074134:
+ https://github.com/curl/curl/commit/32a513e180ce83d5e9b708211306045407074134
+ The target lacks this helper, so the redirect fix cannot compile.
+ Use Curl_handler/Curl_get_scheme_handler because the unchanged
+ upstream Curl_scheme/Curl_get_scheme API fails to compile on 8.7.1.
+ Omit the prerequisite's independent lib/http2.c consumer changes;
+ they are not needed for the redirect fix.
+- Remove the obsolete outer result declaration: the upstream block
+ declares its own result, leaving 8.7.1's outer variable unused
+ (confirmed with -Wall).
+- Omit tests/data/{Makefile.am,test998,test2506},
+ tests/libtest/{Makefile.inc,lib2506.c} and the prerequisite's
+ tests/unit/unit1675.c under the submitted series' code-only policy.
+
+Signed-off-by: Devansh Patel <devanshp@cisco.com>
+---
+ lib/transfer.c | 87 ++++++++++++++++--------------------------------
+ lib/urlapi-int.h | 2 ++
+ lib/urlapi.c | 33 ++++++++++++++++++
+ 3 files changed, 64 insertions(+), 58 deletions(-)
+
+diff --git a/lib/transfer.c b/lib/transfer.c
+index a734629..082b0ae 100644
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -777,7 +777,6 @@ CURLcode Curl_follow(struct Curl_easy *data,
+ bool disallowport = FALSE;
+ bool reachedmax = FALSE;
+ CURLUcode uc;
+- CURLcode result;
+
+ DEBUGASSERT(type != FOLLOW_NONE);
+
+@@ -861,69 +860,41 @@ CURLcode Curl_follow(struct Curl_easy *data,
+ return CURLE_OUT_OF_MEMORY;
+ }
+ else {
+- uc = curl_url_get(data->state.uh, CURLUPART_URL, &newurl, 0);
+- if(uc)
++ bool same_origin;
++ CURLcode result;
++ CURLU *u = curl_url();
++ if(!u)
++ return CURLE_OUT_OF_MEMORY;
++ uc = curl_url_set(u, CURLUPART_URL,
++ data->state.url,
++ CURLU_URLENCODE | CURLU_ALLOW_SPACE);
++ if(!uc)
++ uc = curl_url_get(data->state.uh, CURLUPART_URL, &newurl, 0);
++ if(uc) {
++ curl_url_cleanup(u);
+ return Curl_uc_to_curlcode(uc);
++ }
+
+- /* Clear auth if this redirects to a different port number or protocol,
+- unless permitted */
+- if(!data->set.allow_auth_to_other_hosts && (type != FOLLOW_FAKE)) {
+- char *portnum;
+- int port;
+- bool clear = FALSE;
+-
+- if(data->set.use_port && data->state.allow_port)
+- /* a custom port is used */
+- port = (int)data->set.use_port;
+- else {
+- uc = curl_url_get(data->state.uh, CURLUPART_PORT, &portnum,
+- CURLU_DEFAULT_PORT);
+- if(uc) {
+- free(newurl);
+- return Curl_uc_to_curlcode(uc);
+- }
+- port = atoi(portnum);
+- free(portnum);
+- }
+- if(port != data->info.conn_remote_port) {
+- infof(data, "Clear auth, redirects to port from %u to %u",
+- data->info.conn_remote_port, port);
+- clear = TRUE;
+- }
+- else {
+- char *scheme;
+- const struct Curl_handler *p;
+- uc = curl_url_get(data->state.uh, CURLUPART_SCHEME, &scheme, 0);
+- if(uc) {
+- free(newurl);
+- return Curl_uc_to_curlcode(uc);
+- }
++ same_origin = Curl_url_same_origin(u, data->state.uh);
++ curl_url_cleanup(u);
+
+- p = Curl_get_scheme_handler(scheme);
+- if(p && (p->protocol != data->info.conn_protocol)) {
+- infof(data, "Clear auth, redirects scheme from %s to %s",
+- data->info.conn_scheme, scheme);
+- clear = TRUE;
+- }
+- free(scheme);
+- }
+- if(clear) {
+- result = Curl_reset_userpwd(data);
+- if(result) {
+- free(newurl);
+- return result;
+- }
+- Curl_safefree(data->state.aptr.user);
+- Curl_safefree(data->state.aptr.passwd);
++ if((!same_origin && !data->set.allow_auth_to_other_hosts) ||
++ !data->set.str[STRING_USERNAME]) {
++ result = Curl_reset_userpwd(data);
++ if(result) {
++ free(newurl);
++ return result;
+ }
++ Curl_safefree(data->state.aptr.user);
++ Curl_safefree(data->state.aptr.passwd);
++ }
++ result = Curl_reset_proxypwd(data);
++ if(result) {
++ free(newurl);
++ return result;
+ }
+ }
+-
+- result = Curl_reset_proxypwd(data);
+- if(result) {
+- free(newurl);
+- return result;
+- }
++ DEBUGASSERT(newurl);
+
+ if(type == FOLLOW_FAKE) {
+ /* we're only figuring out the new url if we would've followed locations
+diff --git a/lib/urlapi-int.h b/lib/urlapi-int.h
+index d6e240a..8176ff7 100644
+--- a/lib/urlapi-int.h
++++ b/lib/urlapi-int.h
+@@ -36,4 +36,6 @@ CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host,
+ bool has_scheme);
+ #endif
+
++bool Curl_url_same_origin(CURLU *base, CURLU *href);
++
+ #endif /* HEADER_CURL_URLAPI_INT_H */
+diff --git a/lib/urlapi.c b/lib/urlapi.c
+index dc42489..7b02c86 100644
+--- a/lib/urlapi.c
++++ b/lib/urlapi.c
+@@ -1972,3 +1972,36 @@ nomem:
+ u->portnum = port;
+ return CURLUE_OK;
+ }
++
++bool Curl_url_same_origin(CURLU *base, CURLU *href)
++{
++ const struct Curl_handler *s = NULL;
++
++ /* base must be an absolute URL */
++ if(!base->scheme || !base->host)
++ return FALSE;
++ if(href->scheme && !curl_strequal(base->scheme, href->scheme))
++ return FALSE;
++ if(href->host) {
++ if(!curl_strequal(base->host, href->host))
++ return FALSE;
++ if(!curl_strequal(base->port, href->port)) {
++ /* This may still match if only one has an explicit port
++ * and it is the default for the scheme. */
++ if(base->port && href->port)
++ return FALSE;
++
++ s = Curl_get_scheme_handler(base->scheme);
++ if(!s) /* Cannot match default port for unknown scheme */
++ return FALSE;
++
++ /* The port which is set must be the default one */
++ if((base->port && (base->portnum != s->defport)) ||
++ (href->port && (href->portnum != s->defport)))
++ return FALSE;
++ }
++ }
++ else if(href->port) /* no host in href, then there must be no port */
++ return FALSE;
++ return TRUE;
++}
diff --git a/meta/recipes-support/curl/curl/CVE-2026-6429_p2.patch b/meta/recipes-support/curl/curl/CVE-2026-6429_p2.patch
new file mode 100644
index 0000000..a8c097c
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2026-6429_p2.patch
@@ -0,0 +1,52 @@
+From 818ef36518b76ca02ce9e88f6790188df954afa0 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Fri, 17 Apr 2026 16:25:26 +0200
+Subject: [PATCH] http: clear digest nonce on cross-orgin redirect
+
+Verify in test 1966
+
+Reported-by: Yalguun Tumenkhuu
+Closes #21359
+
+CVE: CVE-2026-6429
+Upstream-Status: Backport [https://github.com/curl/curl/commit/6daf4bc7e276b764a96cf450d4dab34327cd8d53]
+
+Backport Changes:
+- Apply the Digest cleanup to Curl_follow in lib/transfer.c, where
+ 8.7.1 implements the redirect path changed in upstream lib/http.c.
+ Preserve the upstream cleanup and CURL_DISABLE_DIGEST_AUTH guard.
+- Include vauth/vauth.h for Curl_auth_digest_cleanup: transfer.c lacks
+ upstream http.c's declaration include. The unchanged cleanup block
+ fails -Werror=implicit-function-declaration without this header.
+- Omit tests/data/Makefile.am and tests/data/test1966 under the
+ submitted series' code-only policy.
+
+Signed-off-by: Devansh Patel <devanshp@cisco.com>
+---
+ lib/transfer.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/transfer.c b/lib/transfer.c
+index 082b0ae..1ad182f 100644
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -69,6 +69,7 @@
+ #include "speedcheck.h"
+ #include "progress.h"
+ #include "http.h"
++#include "vauth/vauth.h"
+ #include "url.h"
+ #include "getinfo.h"
+ #include "vtls/vtls.h"
+@@ -878,6 +879,11 @@ CURLcode Curl_follow(struct Curl_easy *data,
+ same_origin = Curl_url_same_origin(u, data->state.uh);
+ curl_url_cleanup(u);
+
++#ifndef CURL_DISABLE_DIGEST_AUTH
++ if(!same_origin)
++ Curl_auth_digest_cleanup(&data->state.digest);
++#endif
++
+ if((!same_origin && !data->set.allow_auth_to_other_hosts) ||
+ !data->set.str[STRING_USERNAME]) {
+ result = Curl_reset_userpwd(data);
diff --git a/meta/recipes-support/curl/curl/CVE-2026-6429_p3.patch b/meta/recipes-support/curl/curl/CVE-2026-6429_p3.patch
new file mode 100644
index 0000000..4512bae
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2026-6429_p3.patch
@@ -0,0 +1,29 @@
+From 15bbabb568d8516845223e088177588fa5d30fc4 Mon Sep 17 00:00:00 2001
+From: Joshua Rogers <MegaManSec@users.noreply.github.com>
+Date: Wed, 20 May 2026 01:03:31 +0200
+Subject: [PATCH] urlapi: compare zone-id in Curl_url_same_origin()
+
+Closes #21686
+
+CVE: CVE-2026-6429
+Upstream-Status: Backport [https://github.com/curl/curl/commit/edfc80c7c473b9a09eba9e98e59c4d7d167bbb9e]
+
+Signed-off-by: Devansh Patel <devanshp@cisco.com>
+---
+ lib/urlapi.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/urlapi.c b/lib/urlapi.c
+index 7b02c86..f96ff42 100644
+--- a/lib/urlapi.c
++++ b/lib/urlapi.c
+@@ -1985,6 +1985,9 @@ bool Curl_url_same_origin(CURLU *base, CURLU *href)
+ if(href->host) {
+ if(!curl_strequal(base->host, href->host))
+ return FALSE;
++ if(!curl_strequal(base->zoneid ? base->zoneid : "",
++ href->zoneid ? href->zoneid : ""))
++ return FALSE;
+ if(!curl_strequal(base->port, href->port)) {
+ /* This may still match if only one has an explicit port
+ * and it is the default for the scheme. */
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb
index 144a5c2..e365c68 100644
--- a/meta/recipes-support/curl/curl_8.7.1.bb
+++ b/meta/recipes-support/curl/curl_8.7.1.bb
@@ -51,6 +51,9 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
file://CVE-2026-87864.patch \
file://CVE-2026-8927.patch \
file://CVE-2026-8932.patch \
+ file://CVE-2026-6429_p1.patch \
+ file://CVE-2026-6429_p2.patch \
+ file://CVE-2026-6429_p3.patch \
"
SRC_URI:append:class-nativesdk = " \
next prev parent reply other threads:[~2026-11-20 13:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 13:04 [OE-Core][scarthgap][PATCH 0/4] curl: fix CVE-2026-8927, CVE-2026-8932, CVE-2026-6429 and CVE-2026-7168 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 1/4] curl: Fix CVE-2026-8927 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 2/4] curl: Fix CVE-2026-8932 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco) [this message]
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 4/4] curl: Fix CVE-2026-7168 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120130414.822854-4-devanshp@cisco.com \
--to=devanshp@cisco.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.