From patchwork Fri Nov 20 17:21:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= X-Patchwork-Id: 105108 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.522.1795195309678822847 for ; Fri, 20 Nov 2026 09:21:50 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bootlin.com header.s=dkim header.b=Q959ME8X; spf=pass (domain: bootlin.com, ip: 185.246.85.4, mailfrom: joaomarcos.costa@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 5D8114E4168A; Fri, 20 Nov 2026 17:21:47 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1CE9C601B9; Fri, 20 Nov 2026 17:21:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3962111BC04D7; Fri, 20 Nov 2026 18:21:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795195306; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=kKggwv7j79Wx9jcIe9GQ6PPIOXzYO5Vc0Nh8W1EFcPg=; b=Q959ME8X6yuDPqZBltaeTVQAWkZzIVUosKpGLzEF0S9l1+S/ZmYyWMlYK0KCiUn2ZqP36X kJTxGZV3qZ268mjxmYiP0EhhEX16fFuc+6du3xoggAdti3Ofm119vR0UeRb6Hgojxfjxxl fN8dQJTpSTD0J7PQpMqu+hfEAj2XNIqxVRY9oTfPMPRyqiS7VkNbsCNMs/miWeE6B8EfyB IPZl0zkKReEvK3Oy5HT0yt2TWxPjGgh3J+DwNd7XWAZM8EE7umg0y91Iu3fvqpUELQnPEV nYPpBgZPbQtXBiMMIakMxcR3pie/6eQkW/rlOmNU6HfwB4Efb19dSbPFDQMBbw== From: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= To: openembedded-core@lists.openembedded.org Cc: thomas.petazzoni@bootlin.com, yoann.congal@smile.fr, bastien.jauny@smile.fr, =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Elect?= =?utf-8?q?ric=29?= Subject: [blacksail][PATCH 1/4] curl: fix CVE-2026-87865 Date: Fri, 20 Nov 2026 18:21:23 +0100 Message-ID: <20261120172126.3187901-2-joaomarcos.costa@bootlin.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> References: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Fri, 20 Nov 2026 17:21:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250820 This vulnerability, marked as High [1], was fixed upstream [2] since v8.23.0. Backport the fix to curl v8.22.0. [1] https://nvd.nist.gov/vuln/detail/cve-2026-87865 [2] https://curl.se/docs/CVE-2026-87865.html Signed-off-by: João Marcos Costa (Schneider Electric) --- .../curl/curl/CVE-2026-87865.patch | 216 ++++++++++++++++++ meta/recipes-support/curl/curl_8.22.0.bb | 1 + 2 files changed, 217 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-87865.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-87865.patch b/meta/recipes-support/curl/curl/CVE-2026-87865.patch new file mode 100644 index 0000000000..32a7441c95 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-87865.patch @@ -0,0 +1,216 @@ +From a7622dc02ccc01f7438227f1920db08268a6ccb0 Mon Sep 17 00:00:00 2001 +From: Bobbeh Rhino +Date: Tue, 8 Sep 2026 06:33:27 -0400 +Subject: [PATCH] libssh2: match hashed known_hosts entries by host +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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/323c184b6bdf5b1988a10c0a61560] + +Signed-off-by: João Marcos Costa +--- + 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 24a651d30e..cd28cde76f 100644 +--- a/lib/vssh/libssh2.c ++++ b/lib/vssh/libssh2.c +@@ -685,9 +685,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->origin->hostname, ++ (conn->origin->port != PORT_SSH) ? conn->origin->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 3b32fce7bb..4a27927b1c 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -2090,6 +2090,8 @@ TESTCASES = \ + test3400 \ + test3401 \ + \ ++ test3500 \ ++ \ + test4000 \ + test4001 \ + \ +diff --git a/tests/data/test3500 b/tests/data/test3500 +new file mode 100644 +index 0000000000..1bcf3bc17d +--- /dev/null ++++ b/tests/data/test3500 +@@ -0,0 +1,47 @@ ++ ++ ++ ++ ++SFTP ++known_hosts ++libssh2 ++ ++ ++ ++# Server-side ++ ++ ++Test data ++for hashed known hosts ++ ++ ++ ++# Client-side ++ ++ ++sftp ++ ++ ++sftp ++libssh2 ++!badlibssh ++ ++ ++%PERL %SRCDIR/libtest/test3500.pl %LOGDIR/server/curl_host_key.pub %LOGDIR/known%TESTNUMBER "[%HOSTIP]:%SSHPORT" ++ ++ ++SFTP matches requested hashed known_hosts entry ++ ++ ++--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 ++ ++ ++Test data ++for hashed known hosts ++ ++ ++ ++# Verify data after the test has been "shot" ++ ++ ++ +diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am +index 74eb150742..8fdf484b55 100644 +--- a/tests/libtest/Makefile.am ++++ b/tests/libtest/Makefile.am +@@ -49,7 +49,8 @@ EXTRA_DIST = CMakeLists.txt $(FIRST_C) $(FIRST_H) $(UTILS_C) $(UTILS_H) $(TESTS_ + test1022.pl \ + test307.pl \ + test610.pl \ +- test613.pl ++ test613.pl \ ++ test3500.pl + + CFLAGS += @CURL_CFLAG_EXTRAS@ + +diff --git a/tests/libtest/test3500.pl b/tests/libtest/test3500.pl +new file mode 100755 +index 0000000000..d95f54cecf +--- /dev/null ++++ b/tests/libtest/test3500.pl +@@ -0,0 +1,72 @@ ++#!/usr/bin/env perl ++#*************************************************************************** ++# _ _ ____ _ ++# Project ___| | | | _ \| | ++# / __| | | | |_) | | ++# | (__| |_| | _ <| |___ ++# \___|\___/|_| \_\_____| ++# ++# Copyright (C) Daniel Stenberg, , 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; diff --git a/meta/recipes-support/curl/curl_8.22.0.bb b/meta/recipes-support/curl/curl_8.22.0.bb index 95d5801ad5..979e416249 100644 --- a/meta/recipes-support/curl/curl_8.22.0.bb +++ b/meta/recipes-support/curl/curl_8.22.0.bb @@ -17,6 +17,7 @@ SRC_URI = " \ file://CVE-2026-92388-1.patch \ file://CVE-2026-92388-2.patch \ file://CVE-2026-92389.patch \ + file://CVE-2026-87865.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 20 17:21:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= X-Patchwork-Id: 105109 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.527.1795195313704880508 for ; Fri, 20 Nov 2026 09:21:54 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bootlin.com header.s=dkim header.b=w5v+2LD9; spf=pass (domain: bootlin.com, ip: 185.246.85.4, mailfrom: joaomarcos.costa@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 103514E4168A for ; Fri, 20 Nov 2026 17:21:52 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id DB132601B9; Fri, 20 Nov 2026 17:21:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id DFF7711BC0581; Fri, 20 Nov 2026 18:21:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795195307; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=s2BsdC53q95B8chYcN8nrivJtbamciqGNDKbsIRDhn4=; b=w5v+2LD9JrAU6gz9aIVvd1XQJY1WdZscVXAIrrgQOrZG3r/mGQ8eAJ0GxDyvSUl6jbDWl7 C8IUDtvvLJ/apyv5BfKR42BHuVMRnvsnGfJeVMHOO8vhlfA6JXh9rEKeEZFJcuhxmqPmCW Hn19UCFbl8kLLVoJrfP4Y9n18WKxRolvPNtuEuvL+7cWTnardbQMDw5eu04UBA34vVvJNq 4GPGJ+EzCNPBDvuIpXNRbx5mvQfQUU3KcdH4sYcC2fBboRG63G7HxuHD7FrDCgVr5P0lLA H+IrgPPR+jSOSQjIiAwQKotkIh2D5k9JhyYszrL1nHbR6kUMF3Ifw+p/xQYmpQ== From: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= To: openembedded-core@lists.openembedded.org Cc: thomas.petazzoni@bootlin.com, yoann.congal@smile.fr, bastien.jauny@smile.fr, =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Elect?= =?utf-8?q?ric=29?= Subject: [blacksail][PATCH 2/4] curl: fix CVE-2026-92386 Date: Fri, 20 Nov 2026 18:21:24 +0100 Message-ID: <20261120172126.3187901-3-joaomarcos.costa@bootlin.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> References: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Fri, 20 Nov 2026 17:22:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250821 This vulnerability, marked as High [1], was fixed upstream [2] since v8.23.0. Backport the fix to curl v8.22.0. [1] https://nvd.nist.gov/vuln/detail/cve-2026-92386 [2] https://curl.se/docs/CVE-2026-92386.html Signed-off-by: João Marcos Costa (Schneider Electric) --- .../curl/curl/CVE-2026-92386.patch | 33 +++++++++++++++++++ meta/recipes-support/curl/curl_8.22.0.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92386.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-92386.patch b/meta/recipes-support/curl/curl/CVE-2026-92386.patch new file mode 100644 index 0000000000..3e8f249b69 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-92386.patch @@ -0,0 +1,33 @@ +From 58eac7dbcf37290774f48b3464266dcc080fd700 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Wed, 16 Sep 2026 11:09:18 +0200 +Subject: [PATCH] cookie: accept slightly longer lines in cookie jars +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Closes #22964 + +CVE: CVE-2026-92386 +Upstream-Status: Backport [https://github.com/curl/curl/commit/445aa87e13f91c94bc742f54343a2eac924e1765] + +Signed-off-by: João Marcos Costa +--- + lib/cookie.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 3255668ec7..12aae672dc 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -1181,7 +1181,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) { diff --git a/meta/recipes-support/curl/curl_8.22.0.bb b/meta/recipes-support/curl/curl_8.22.0.bb index 979e416249..4c6a088e62 100644 --- a/meta/recipes-support/curl/curl_8.22.0.bb +++ b/meta/recipes-support/curl/curl_8.22.0.bb @@ -18,6 +18,7 @@ SRC_URI = " \ file://CVE-2026-92388-2.patch \ file://CVE-2026-92389.patch \ file://CVE-2026-87865.patch \ + file://CVE-2026-92386.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 20 17:21:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= X-Patchwork-Id: 105110 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.528.1795195314744651414 for ; Fri, 20 Nov 2026 09:21:55 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bootlin.com header.s=dkim header.b=eu23OnUp; spf=pass (domain: bootlin.com, ip: 185.246.85.4, mailfrom: joaomarcos.costa@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id EE4B94E4168C; Fri, 20 Nov 2026 17:21:52 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id C5A71601B9; Fri, 20 Nov 2026 17:21:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A41F111BC04D7; Fri, 20 Nov 2026 18:21:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795195312; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=tKYnYEb1IuQkc1b3IHnl3WYbGGm1SoT4coqhBBg1rUE=; b=eu23OnUpbXgidAhzDesomCiqozvLkQsMetbA0c9vKDZziU2RaBkH+o8Ss8cRiEOA7dOIN5 SKWEeBQK8QBIdR7NiDurs2k1y1ldegDQLJGeVan28C583mwAQkmc9qYtjeVjy+ElRXzc5B 7gYp8hnaZTvKYh7r8UoR4m8Z1u7/OETPSbTqw1TVTtcB6y99X16SKA8eGy0TjFzaLT1qzc yboLf/sY3ZOyJXIZlqxWoXeUsALJO4na2niWeTPs132TJ+eYEc40CPKAAqJ5I6+IcxdA/1 6GXoKlbtJgGnIblgu8KPGjCx2Pz5gxpMeDT5n6mu00ZkBSgIOD9PfgRZZVK9dA== From: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= To: openembedded-core@lists.openembedded.org Cc: thomas.petazzoni@bootlin.com, yoann.congal@smile.fr, bastien.jauny@smile.fr, =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Elect?= =?utf-8?q?ric=29?= Subject: [blacksail][PATCH 3/4] curl: fix CVE-2026-92391 Date: Fri, 20 Nov 2026 18:21:25 +0100 Message-ID: <20261120172126.3187901-4-joaomarcos.costa@bootlin.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> References: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Fri, 20 Nov 2026 17:22:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250822 This vulnerability, marked as High [1], was fixed upstream [2] since v8.23.0. Backport the fix to curl v8.22.0. [1] https://nvd.nist.gov/vuln/detail/cve-2026-92391 [2] https://curl.se/docs/CVE-2026-92391.html Signed-off-by: João Marcos Costa (Schneider Electric) --- .../curl/curl/CVE-2026-92391.patch | 200 ++++++++++++++++++ meta/recipes-support/curl/curl_8.22.0.bb | 1 + 2 files changed, 201 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-92391.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-92391.patch b/meta/recipes-support/curl/curl/CVE-2026-92391.patch new file mode 100644 index 0000000000..55288d5296 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-92391.patch @@ -0,0 +1,200 @@ +From 8f839f842ec95a897d3f716f7220d1460109e3d0 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Sun, 13 Sep 2026 00:06:44 +0200 +Subject: [PATCH] mime: do curl_mime_free() non-recursively +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Verify with test 3595: deeply nested curl_mime_free() + +Closes #22927 + +CVE: CVE-2026-92391 +Upstream-Status: Backport [https://github.com/curl/curl/commit/d7546809d5bd548b69ec49fca26565c8f6f0d344] + +Signed-off-by: João Marcos Costa +--- + lib/mime.c | 28 +++++++++++---- + tests/data/Makefile.am | 2 +- + tests/data/test3595 | 21 ++++++++++++ + tests/libtest/Makefile.inc | 3 +- + tests/libtest/lib3595.c | 70 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 115 insertions(+), 9 deletions(-) + create mode 100644 tests/data/test3595 + create mode 100644 tests/libtest/lib3595.c + +diff --git a/lib/mime.c b/lib/mime.c +index 6004375765..41150dca94 100644 +--- a/lib/mime.c ++++ b/lib/mime.c +@@ -1109,20 +1109,36 @@ void Curl_mime_cleanpart(curl_mimepart *part) + } + } + +-/* Recursively delete a mime handle and its parts. */ ++/* Non-recursively delete a mime handle and its parts. */ + void curl_mime_free(curl_mime *mime) + { + curl_mimepart *part; + +- if(mime) { +- mime_subparts_unbind(mime); /* Be sure it is not referenced anymore. */ +- while(mime->firstpart) { +- part = mime->firstpart; ++ if(!mime) ++ return; ++ ++ mime_subparts_unbind(mime); /* Be sure it is not referenced anymore. */ ++ ++ while(mime) { ++ part = mime->firstpart; ++ if(part) { + mime->firstpart = part->nextpart; ++ if(part->kind == MIMEKIND_MULTIPART && part->arg && ++ part->freefunc == mime_subparts_free) { ++ curl_mime *subparts = (curl_mime *)part->arg; ++ part->freefunc = NULL; ++ cleanup_part_content(part); ++ subparts->parent = mime->parent; ++ mime->parent = (curl_mimepart *)subparts; ++ } + Curl_mime_cleanpart(part); + curlx_free(part); + } +- curlx_free(mime); ++ else { ++ curl_mime *parent = (curl_mime *)mime->parent; ++ curlx_free(mime); ++ mime = parent; ++ } + } + } + +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index 4a27927b1c..e0ce23abfb 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -2091,7 +2091,7 @@ TESTCASES = \ + test3401 \ + \ + test3500 \ +- \ ++ test3595 \ + test4000 \ + test4001 \ + \ +diff --git a/tests/data/test3595 b/tests/data/test3595 +new file mode 100644 +index 0000000000..b2b1dd26c2 +--- /dev/null ++++ b/tests/data/test3595 +@@ -0,0 +1,21 @@ ++ ++ ++ ++ ++mime ++ ++ ++ ++# Client-side ++ ++ ++lib%TESTNUMBER ++ ++ ++curl_mime_free ++ ++ ++ ++ ++ ++ +diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc +index 26c72e5672..9cdc7b2da1 100644 +--- a/tests/libtest/Makefile.inc ++++ b/tests/libtest/Makefile.inc +@@ -325,5 +325,4 @@ TESTS_C = \ + lib3105.c \ + lib3207.c \ + lib3208.c \ +- lib5000.c \ +- lib5004.c ++ lib3595.c +diff --git a/tests/libtest/lib3595.c b/tests/libtest/lib3595.c +new file mode 100644 +index 0000000000..1f343f503e +--- /dev/null ++++ b/tests/libtest/lib3595.c +@@ -0,0 +1,70 @@ ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Daniel Stenberg, , 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 ++ * ++ ***************************************************************************/ ++#include "unitcheck.h" ++ ++static CURLcode test_lib3595(const char *arg) ++{ ++ UNITTEST_BEGIN_SIMPLE ++ ++#if !defined(CURL_DISABLE_MIME) && \ ++ (!defined(CURL_DISABLE_HTTP) || \ ++ !defined(CURL_DISABLE_SMTP) || \ ++ !defined(CURL_DISABLE_IMAP)) ++ ++ curl_mime *root = NULL; ++ curl_mime *current = NULL; ++ curl_mime *sub = NULL; ++ curl_mimepart *part = NULL; ++ int i; ++ ++ if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { ++ curl_mfprintf(stderr, "curl_global_init() failed\n"); ++ return TEST_ERR_MAJOR_BAD; ++ } ++ ++ /* Create a deeply nested mime structure to verify that non-recursive ++ curl_mime_free works properly. */ ++ (void)arg; ++ root = curl_mime_init(NULL); ++ fail_unless(root != NULL, "curl_mime_init root failed"); ++ current = root; ++ ++ for(i = 0; i < 50; i++) { ++ part = curl_mime_addpart(current); ++ fail_unless(part != NULL, "curl_mime_addpart failed"); ++ sub = curl_mime_init(NULL); ++ fail_unless(sub != NULL, "curl_mime_init sub failed"); ++ curl_mime_subparts(part, sub); ++ current = sub; ++ } ++ ++ /* Free deep structure */ ++ curl_mime_free(root); ++ curl_global_cleanup(); ++#else ++ (void)arg; ++#endif ++ ++ UNITTEST_END_SIMPLE ++} diff --git a/meta/recipes-support/curl/curl_8.22.0.bb b/meta/recipes-support/curl/curl_8.22.0.bb index 4c6a088e62..6445aae426 100644 --- a/meta/recipes-support/curl/curl_8.22.0.bb +++ b/meta/recipes-support/curl/curl_8.22.0.bb @@ -19,6 +19,7 @@ SRC_URI = " \ file://CVE-2026-92389.patch \ file://CVE-2026-87865.patch \ file://CVE-2026-92386.patch \ + file://CVE-2026-92391.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 20 17:21:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= X-Patchwork-Id: 105111 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.529.1795195319828344900 for ; Fri, 20 Nov 2026 09:22:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bootlin.com header.s=dkim header.b=UrvG2KQo; spf=pass (domain: bootlin.com, ip: 185.246.85.4, mailfrom: joaomarcos.costa@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 3763A4E4168A; Fri, 20 Nov 2026 17:21:58 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 0C148601B9; Fri, 20 Nov 2026 17:21:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 835D811BC066B; Fri, 20 Nov 2026 18:21:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795195313; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Qbu7KK4s6s2jrPNFB+FJ45saACXN2WiZrDZB/5U3JI4=; b=UrvG2KQoeD/hYBZwkClB0T46A1isXMwU4gCdy7azfOT9ETTFFmhxkTGLVKwhw29XjH3XXb BGEh7sftJJtalb1u4hvBU4HKwMxKYphddyqxgWQKw4l/vE7zgKM4C93cJGYnt1z4uzxP2B QB1NC6n1TaWH5OmbMgBwrrdIjZl4SiEtcPRhr5fqcXL6VIPs0mfTF7cALScCBYCqfyHa1W KfSCpOgCXXFlhTuR5gQb2RoxZOU+X8BhYxZWcfTSStn2l1fw6ta1vtGNSVPyIFVh8KDQrb fJ0+lTiSbaSHFiVreGylt3bhc4Yz/hNGWkewY4Pd3DEZnh/yRv8Mr354q8YnFg== From: =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Electric=29?= To: openembedded-core@lists.openembedded.org Cc: thomas.petazzoni@bootlin.com, yoann.congal@smile.fr, bastien.jauny@smile.fr, =?utf-8?q?Jo=C3=A3o_Marcos_Costa_=28Schneider_Elect?= =?utf-8?q?ric=29?= Subject: [blacksail][PATCH 4/4] curl: fix CVE-2026-94266 Date: Fri, 20 Nov 2026 18:21:26 +0100 Message-ID: <20261120172126.3187901-5-joaomarcos.costa@bootlin.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> References: <20261120172126.3187901-1-joaomarcos.costa@bootlin.com> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Fri, 20 Nov 2026 17:22:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250823 This vulnerability, marked as High [1], was fixed upstream [2] since v8.23.0. Backport the fix to curl v8.22.0. [1] https://nvd.nist.gov/vuln/detail/cve-2026-94266 [2] https://curl.se/docs/CVE-2026-94266.html Signed-off-by: João Marcos Costa (Schneider Electric) --- .../curl/curl/CVE-2026-94266.patch | 220 ++++++++++++++++++ meta/recipes-support/curl/curl_8.22.0.bb | 1 + 2 files changed, 221 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-94266.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-94266.patch b/meta/recipes-support/curl/curl/CVE-2026-94266.patch new file mode 100644 index 0000000000..1e85a70190 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-94266.patch @@ -0,0 +1,220 @@ +From 835f55d8f87da137c262af5d16ba209bcd4398de Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 21 Sep 2026 11:13:13 +0200 +Subject: [PATCH] getinfo: make sure CURLINFO_EFFECTIVE_URL does not contain + creds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported-by: Joshua Rogers + +Verified in test 1876 + +Closes #23016 + +CVE: CVE-2026-94266 +Upstream-Status: Backport [https://github.com/curl/curl/commit/7a6bd027d0de2b6857472d35da090ef60cc29f19] + +Signed-off-by: João Marcos Costa +--- + lib/getinfo.c | 47 +++++++++++++++++++++++++---- + lib/transfer.c | 1 + + lib/url.c | 1 + + lib/urldata.h | 1 + + tests/data/Makefile.am | 2 +- + tests/data/test1876 | 67 ++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 113 insertions(+), 6 deletions(-) + create mode 100644 tests/data/test1876 + +diff --git a/lib/getinfo.c b/lib/getinfo.c +index 23f1de270c..eda62da515 100644 +--- a/lib/getinfo.c ++++ b/lib/getinfo.c +@@ -63,6 +63,7 @@ void Curl_initinfo(struct Curl_easy *data) + + curlx_safefree(info->contenttype); + curlx_safefree(info->wouldredirect); ++ curlx_safefree(info->effective_url); + + memset(&info->primary, 0, sizeof(info->primary)); + info->retry_after = 0; +@@ -76,15 +77,51 @@ void Curl_initinfo(struct Curl_easy *data) + #endif + } + ++static CURLcode effective_url(struct Curl_easy *data, ++ const char **param_charp) ++{ ++ const char *s = Curl_bufref_ptr(&data->state.url); ++ *param_charp = s ? s : ""; ++ if(s) { ++ char *url = NULL; ++ /* Make a copy of the URL without credentials */ ++ CURLU *u = curl_url(); ++ CURLUcode uc; ++ if(!u) ++ return CURLE_OUT_OF_MEMORY; ++ ++ uc = curl_url_set(u, CURLUPART_URL, s, ++ CURLU_NON_SUPPORT_SCHEME | ++ (data->set.path_as_is ? CURLU_PATH_AS_IS : 0)); ++ if(!uc) ++ uc = curl_url_set(u, CURLUPART_USER, NULL, 0); ++ if(!uc) ++ uc = curl_url_set(u, CURLUPART_PASSWORD, NULL, 0); ++ if(!uc) ++ uc = curl_url_get(u, CURLUPART_URL, &url, CURLU_GET_EMPTY); ++ ++ curl_url_cleanup(u); ++ ++ if(uc || !url) ++ return CURLE_OUT_OF_MEMORY; ++ if(strcmp(url, s)) { ++ /* they are different */ ++ curlx_free(data->info.effective_url); ++ data->info.effective_url = url; ++ *param_charp = url; ++ } ++ else ++ curl_free(url); ++ } ++ return CURLE_OK; ++} ++ + static CURLcode getinfo_char(struct Curl_easy *data, CURLINFO info, + const char **param_charp) + { + switch(info) { +- case CURLINFO_EFFECTIVE_URL: { +- const char *s = Curl_bufref_ptr(&data->state.url); +- *param_charp = s ? s : ""; +- } +- break; ++ case CURLINFO_EFFECTIVE_URL: ++ return effective_url(data, param_charp); + case CURLINFO_EFFECTIVE_METHOD: { + const char *m = CURL_EASY_STR(data, STRING_CUSTOMREQUEST); + if(!m) { +diff --git a/lib/transfer.c b/lib/transfer.c +index 3b6c5c03dd..d940f8dc22 100644 +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -503,6 +503,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + data->state.authhost.want = data->set.httpauth; + data->state.authproxy.want = data->set.proxyauth; + curlx_safefree(data->info.wouldredirect); ++ curlx_safefree(data->info.effective_url); + Curl_data_priority_clear_state(data); + if(data->set.http_auto_referer) + Curl_bufref_free(&data->state.referer); +diff --git a/lib/url.c b/lib/url.c +index 6eeae43d0d..61126a1d29 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -267,6 +267,7 @@ CURLcode Curl_close(struct Curl_easy **datap) + curlx_safefree(data->state.most_recent_ftp_entrypath); + curlx_safefree(data->info.contenttype); + curlx_safefree(data->info.wouldredirect); ++ curlx_safefree(data->info.effective_url); + + /* No longer a dirty share, if it exists */ + if(Curl_share_easy_unlink(data)) +diff --git a/lib/urldata.h b/lib/urldata.h +index 1c0101847b..fb6df8619e 100644 +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -409,6 +409,7 @@ struct PureInfo { + curl_off_t numconnects; /* how many new connections libcurl created */ + char *contenttype; /* the content type of the object */ + char *wouldredirect; /* URL this would have been redirected to if asked to */ ++ char *effective_url; /* when needed */ + curl_off_t retry_after; /* info from Retry-After: header */ + const char *conn_scheme; + int httpcode; /* Recent HTTP, FTP, RTSP or SMTP response code */ +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index e0ce23abfb..8cdeaf7a0a 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -1740,7 +1740,7 @@ TESTCASES = \ + test1849 \ + test1850 \ + test1851 \ +- \ ++ test1876 \ + test1900 \ + test1901 \ + test1902 \ +diff --git a/tests/data/test1876 b/tests/data/test1876 +new file mode 100644 +index 0000000000..4fc3b9fd02 +--- /dev/null ++++ b/tests/data/test1876 +@@ -0,0 +1,67 @@ ++ ++ ++ ++ ++netrc ++ ++ ++ ++# Server-side ++ ++ ++HTTP/1.1 301 redir ++Content-Length: 0 ++Content-Type: text/html ++Location: %TESTNUMBER0002 ++ ++ ++ ++ ++HTTP/1.1 200 OK ++Content-Length: 0 ++Content-Type: text/html ++ ++ ++ ++ ++ ++# Client-side ++ ++ ++http ++ ++ ++verify no credentials present in effective URL after redirect ++ ++ ++machine %HOSTIP ++login netrcuser ++password netrcSECRET123 ++ ++ ++ ++http://%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional --netrc-file %LOGDIR/netrc -L -w 'EFFECTIVE_URL=%{url_effective}\n' ++ ++ ++ ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic %b64[netrcuser:netrcSECRET123]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ ++GET /%TESTNUMBER0002 HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic %b64[netrcuser:netrcSECRET123]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++EFFECTIVE_URL=http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 ++ ++ ++ diff --git a/meta/recipes-support/curl/curl_8.22.0.bb b/meta/recipes-support/curl/curl_8.22.0.bb index 6445aae426..64397f1a77 100644 --- a/meta/recipes-support/curl/curl_8.22.0.bb +++ b/meta/recipes-support/curl/curl_8.22.0.bb @@ -20,6 +20,7 @@ SRC_URI = " \ file://CVE-2026-87865.patch \ file://CVE-2026-92386.patch \ file://CVE-2026-92391.patch \ + file://CVE-2026-94266.patch \ " SRC_URI:append:class-nativesdk = " \