Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" <dkelaiya@cisco.com>
To: openembedded-core@lists.openembedded.org
Cc: Darsh Kelaiya <dkelaiya@cisco.com>
Subject: [OE-core][wrynose][PATCH 05/12] curl: fix CVE-2026-86412
Date: Tue,  3 Nov 2026 23:36:20 -0800	[thread overview]
Message-ID: <20261104073627.302002-6-dkelaiya@cisco.com> (raw)
In-Reply-To: <20261104073627.302002-1-dkelaiya@cisco.com>

From: Darsh Kelaiya <dkelaiya@cisco.com>

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

Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
 .../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

diff --git a/meta/recipes-support/curl/curl/CVE-2026-86412.patch b/meta/recipes-support/curl/curl/CVE-2026-86412.patch
new file mode 100644
index 00000000000..2a846fdbed5
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2026-86412.patch
@@ -0,0 +1,34 @@
+From 6ded3e594455d6f018fab5f2f5d916eb9bc4ef94 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+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 <dkelaiya@cisco.com>
+---
+ 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
diff --git a/meta/recipes-support/curl/curl_8.19.0.bb b/meta/recipes-support/curl/curl_8.19.0.bb
index c4a1167d1ba..7749c1907f9 100644
--- a/meta/recipes-support/curl/curl_8.19.0.bb
+++ b/meta/recipes-support/curl/curl_8.19.0.bb
@@ -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 = " \
-- 
2.35.6

  parent reply	other threads:[~2026-11-04  7:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-04  7:36 [OE-core][wrynose][PATCH 00/12] curl: Security fixes Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 01/12] curl: fix CVE-2026-86414 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 02/12] curl: fix CVE-2026-86409 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 03/12] curl: fix CVE-2026-87862 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 04/12] curl: fix CVE-2026-92387 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) [this message]
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 06/12] curl: fix CVE-2026-92386 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 07/12] curl: fix CVE-2026-107928 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 08/12] curl: fix CVE-2026-87864 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 09/12] curl: fix CVE-2026-92389 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 10/12] curl: fix CVE-2026-87865 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 11/12] curl: set CVE_STATUS for CVE-2026-19931 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-04  7:36 ` [OE-core][wrynose][PATCH 12/12] curl: fix CVE-2026-18924 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-16  0:14 ` [OE-core][wrynose][PATCH 00/12] curl: Security fixes Yoann Congal

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=20261104073627.302002-6-dkelaiya@cisco.com \
    --to=dkelaiya@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox