diff mbox series

[wrynose,05/12] curl: fix CVE-2026-86412

Message ID 20261104073627.302002-6-dkelaiya@cisco.com
State New
Headers show
Series curl: Security fixes | expand

Commit Message

Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) Nov. 4, 2026, 7:36 a.m. UTC 
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 mbox series

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 = " \