[OE-core][whinlatter 7/7] curl: patch CVE-2026-3805

Yoann Congal
2026-03-20T23:07:33Z

Pick patch from [1].

[1] https://curl.se/docs/CVE-2026-3805.html

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
.../curl/curl/CVE-2026-3805.patch | 67 +++++++++++++++++++
meta/recipes-support/curl/curl_8.17.0.bb | 1 +
2 files changed, 68 insertions(+)
create mode 100644 meta/recipes-support/curl/curl/CVE-2026-3805.patch

diff --git a/meta/recipes-support/curl/curl/CVE-2026-3805.patch b/meta/recipes-support/curl/curl/CVE-2026-3805.patch
new file mode 100644
index 00000000000..f3b3285a3ab
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2026-3805.patch
@@ -0,0 +1,67 @@
+From e090be9f73a7a71459ef678c7cc4b1f75e3ea883 Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Sun, 8 Mar 2026 14:30:00 +0100
+Subject: [PATCH] smb: free the path in the request struct properly
+
+Closes #20854
+
+CVE: CVE-2026-3805
+Upstream-Status: Backport [https://github.com/curl/curl/commit/e090be9f73a7a71459ef678c7cc4b1f75e3ea883]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ lib/smb.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/lib/smb.c b/lib/smb.c
+index 41ba48fe89..00297adee7 100644
+--- a/lib/smb.c
++++ b/lib/smb.c
+@@ -448,9 +448,7 @@ static void smb_easy_dtor(void *key, size_t klen, void *entry)
+ struct smb_request *req = entry;
+ (void)key;
+ (void)klen;
+- /* `req->path` points to somewhere in `struct smb_conn` which is
+- * kept at the connection meta. If the connection is destroyed first,
+- * req->path points to free'd memory. */
++ Curl_safefree(req->path);
+ free(req);
+ }
+
+@@ -1240,7 +1238,7 @@ static CURLcode smb_parse_url_path(struct Curl_easy *data,
+ struct smb_request *req)
+ {
+ char *path;
+- char *slash;
++ char *slash, *s;
+ CURLcode result;
+
+ /* URL decode the path */
+@@ -1249,6 +1247,7 @@ static CURLcode smb_parse_url_path(struct Curl_easy *data,
+ return result;
+
+ /* Parse the path for the share */
++ Curl_safefree(smbc->share);
+ smbc->share = strdup((*path == '/' || *path == '\\') ? path + 1 : path);
+ free(path);
+ if(!smbc->share)
+@@ -1268,12 +1267,15 @@ static CURLcode smb_parse_url_path(struct Curl_easy *data,
+ /* Parse the path for the file path converting any forward slashes into
+ backslashes */
+ *slash++ = 0;
+- req->path = slash;
+-
+- for(; *slash; slash++) {
+- if(*slash == '/')
+- *slash = '\\';
++ for(s = slash; *s; s++) {
++ if(*s == '/')
++ *s = '\\';
+ }
++ /* keep a copy at easy struct to not share this with connection state */
++ req->path = curlx_strdup(slash);
++ if(!req->path)
++ return CURLE_OUT_OF_MEMORY;
++
+ return CURLE_OK;
+ }
+
diff --git a/meta/recipes-support/curl/curl_8.17.0.bb b/meta/recipes-support/curl/curl_8.17.0.bb
index 7211c43afd2..24af8613ab9 100644
--- a/meta/recipes-support/curl/curl_8.17.0.bb
+++ b/meta/recipes-support/curl/curl_8.17.0.bb
@@ -25,6 +25,7 @@ SRC_URI = " \
file://CVE-2026-3783.patch \
file://0001-build-fix-Wunused-macros-warnings-and-related-tidy-u.patch \
file://CVE-2026-3784-02.patch \
+ file://CVE-2026-3805.patch \