From patchwork Fri Nov 20 13:04:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 105070 Received: from aer-iport-5.cisco.com (aer-iport-5.cisco.com [173.38.203.67]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.5427.1795179859308749116 for ; Fri, 20 Nov 2026 05:04:19 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=De3rqEZE; spf=pass (domain: cisco.com, ip: 173.38.203.67, mailfrom: devanshp@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=4523; q=dns/txt; s=iport01; t=1795179859; x=1796389459; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=QD1D2tJvy5dSZCcvnG44frkDu+/NA12O/aE6TG6nHBo=; b=De3rqEZEctxSnOQO1zrPEHfxSOesivwYfu8Q4//axYtEk9qoojZ6IJ8E pMejc4YIs1HSPjuIb0+cfMZoEINR65xMqRG2jSpqmLv+/51YuOQUa8Ehc Pm8Wld1h74zxFi45+K5nVJM74sYevfEAYdZvy9o7eqvrvKKSI2tzn6zn7 5Qyqxr+Vfi7P3JFMIF1iLeoJJV+0ikp2J61n4/gxZiJmzyYE+kIkQZFue 0kpZXqiPXpF1T4XEN0JcRmL7ZekG3jfMGQryNegMpqFWS6c3NYgFZ3MB1 mHdnWS5z61f8npLWtnWrndeLkGKqLg/Zp2ivVsZlCWeLRM0Z05NoQD/2V g==; X-CSE-ConnectionGUID: LaNl/mwLSzSTG2gSAIj1ug== X-CSE-MsgGUID: jjVoiAHISd+Cih/GtQNvsg== X-IPAS-Result: A0BIAgAgRQBr/9RK/pBaglmCV3VhQkmUKoIhA54pgX4PAQEBD0QNBAEBhQUCjiECJjQJDgECBAMCAwEBAQEBAQEBAQEBAQoBAQUBAQECAQcFgQ4Thk8NkBIBAgEDJwsBGAE9HAMBAi8rIwgZgwIBgnQCAREGuEwbN4F5M4EBgykBMQUJAgJAAVDbMwELFAGBOIVCiCRdGAGEfScbG4FyhH+BBYFcAgEBGIENhn8EgiKBDIFUHox5AoFPiCZIgR4DWSwBVRMNCgsHBYFoAzUSKhVuMh2BIzsXgQcbBgWBHIEegRKBA12BKyheIYEIgXYCglGCAAIBSUEOB0VTCSVDEkckIggSCQETGiwKgRo1PAkmPxUMZwsaBWEIAg0MdDkQMB4kLwUaJj4bCoEMJx8eGw4CHxAGDRgNSBEsNxUZBD5uB5NsgxlhLQETFgEBgj0hCKU7oREKKIN5jCSVOhozhASUGpJUmQiOCpVpaIRqgWg8gVlwFYMiCRY0GQ+OLgsLg2CFE4EtyBsjNQIJMgEBBwIHDgMLgWiQAIF+AQE IronPort-Data: A9a23:WUwzjq2Gx8sH/lPCHfbD5Ydwkn2cJEfYwER7XKvMYLTBsI5bpzRWy DBKDTqEO/+DZDf8e992Oom1pxwGuZKBz4RmQFFv3Hw8FHgiRegpqji6wuYcGwvIc6UvmWo+t 512huHodZ5yEzmE4Ef3b9ANlFEkvYmQXL3wFeXYDS54QA5gWU8JhAlq8wIDqtYAbeORXUXX5 rsen+WFYAX7gmcuajtOg06+gEoHUMra6WtwUmMWPZinjHeG/1EJAZQWI72GLneQauF8Au6gS u/f+6qy92Xf8g1FIovNfmHTKxBirhb6ZGBiu1IOM0SQqkEqSh8ajs7XAMEhhXJ/0F1lqTzeJ OJl7vRcQS9xVkHFdX90vxNwS0mSNoUekFPLzOTWXcG7lyX7n3XQL/pGKEgQOcod5cJME1py2 qYXExksbEmeiLfjqF67YrEEasULJcTxeYdasXZ6wHSAVLAtQIvIROPB4towMDUY35wSW6yDO 4xGNXw1NU6ojx5nYj/7DLoykfmhgGL/axVTqUmeouw85G27IAlZjemzaoeNI4XiqcN9nESmo WPv30XCDlIxNdzY5ia81Gy3ibqa9c/8cMdIfFGizdZtmFCVy2kZBREaWFf+qv6jh2a6WslDM AoT4icooK04+UCnQ9W7WAe3yENopTYVVsAVF6gx7xuAj/ONpQ2YHWMDCDVGbbTKqfMLeNDj7 XfR9/uBONClmOT9pa61nltMkQ6PBA== IronPort-HdrOrdr: A9a23:1FrGUqDcgsEMdEvlHemA55DYdb4zR+YMi2TDsHoBLSC9Hfb3qy nDppkmPFrP+VUssRIb6LW90de7IE80nKQdieJ6AV7hZniFhILCFu5fBOXZrwEIYxefysdtkY F9bqN5FNr8SXJ+jcr8/U2ENuxI+qjhzEht7t2utkuEimpRGsdd0zs= X-Talos-CUID: 9a23:0CWb/mtIAus/V7sFWtog/xXo6IsBe1vZi3LPB3SqMlpGErKuYH6Sob5rxp8= X-Talos-MUID: 9a23:lEw/9QXzXKVz7vDq/D3uujZjHedJ2KjtI0EN1roagu+aLiMlbg== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,223,1787011200"; d="scan'208";a="59625011" Received: from aer-l-core-11.cisco.com ([144.254.74.212]) by aer-iport-5.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 20 Nov 2026 13:04:15 +0000 Received: from sjc-ads-8099.cisco.com (sjc-ads-8099.cisco.com [171.68.208.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aer-l-core-11.cisco.com (Postfix) with ESMTPS id 6E9C3180001F7 for ; Fri, 20 Nov 2026 13:04:15 +0000 (GMT) Received: by sjc-ads-8099.cisco.com (Postfix, from userid 1887503) id 1FAA7CBF201; Fri, 20 Nov 2026 05:04:14 -0800 (PST) From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-core@lists.openembedded.org Subject: [OE-Core][scarthgap][PATCH 1/4] curl: Fix CVE-2026-8927 Date: Fri, 20 Nov 2026 05:04:11 -0800 Message-Id: <20261120130414.822854-2-devanshp@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com> References: <20261120130414.822854-1-devanshp@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-8099.cisco.com [171.68.208.137];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 171.68.208.137, sjc-ads-8099.cisco.com X-Outbound-Node: aer-l-core-11.cisco.com 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 13:04:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250783 From: Devansh Patel 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/5c225384b8d52c67ce8259c6e4203bc57aacb567 [2] https://curl.se/docs/CVE-2026-8927.html [3] https://www.cve.org/CVERecord?id=CVE-2026-8927 Signed-off-by: Devansh Patel --- .../curl/curl/CVE-2026-8927.patch | 87 +++++++++++++++++++ meta/recipes-support/curl/curl_8.7.1.bb | 1 + 2 files changed, 88 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-8927.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-8927.patch b/meta/recipes-support/curl/curl/CVE-2026-8927.patch new file mode 100644 index 0000000..a8b07a5 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-8927.patch @@ -0,0 +1,87 @@ +From d4e71ad3aed07542606d9c4afdf6884eccdb3a26 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 18 May 2026 23:47:11 +0200 +Subject: [PATCH] url: detect proxy changes read from environment + +When a proxy is set from an environment variable, detect if that proxy +is not the same as previously and flush state. + +Verified by test1647: verify changing proxy with env variables and make +sure Digest state is flushed in the second use + +Closes #21666 + +CVE: CVE-2026-8927 +Upstream-Status: Backport [https://github.com/curl/curl/commit/5c225384b8d52c67ce8259c6e4203bc57aacb567] + +Backport Changes: +- Use the 8.7.1 free()/strdup() names and include vauth/vauth.h. + Keep the parsed proxy string until the existing out cleanup so the + upstream Digest-state comparison can still read it. +- Omit tests/data/Makefile.am, tests/data/test1647, + tests/libtest/Makefile.inc and tests/libtest/lib1647.c. + The test-only feature-detection dependency is therefore unnecessary. + +Signed-off-by: Devansh Patel +--- + lib/url.c | 13 ++++++++++++- + lib/urldata.h | 1 + + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/lib/url.c b/lib/url.c +index 9e1ca03..fe76397 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -79,6 +79,7 @@ + #include "share.h" + #include "content_encoding.h" + #include "http_digest.h" ++#include "vauth/vauth.h" + #include "http_negotiate.h" + #include "select.h" + #include "multiif.h" +@@ -331,6 +332,9 @@ CURLcode Curl_close(struct Curl_easy **datap) + Curl_wildcard_dtor(&data->wildcard); + Curl_freeset(data); + Curl_headers_cleanup(data); ++#ifndef CURL_DISABLE_DIGEST_AUTH ++ free(data->state.envproxy); ++#endif + free(data); + return CURLE_OK; + } +@@ -2535,7 +2539,6 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data, + curl_proxytype ptype = (curl_proxytype)conn->http_proxy.proxytype; + if(proxy) { + result = parse_proxy(data, conn, proxy, ptype); +- Curl_safefree(proxy); /* parse_proxy copies the proxy string */ + if(result) + goto out; + } +@@ -2554,6 +2557,14 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data, + result = CURLE_UNSUPPORTED_PROTOCOL; + goto out; + #else ++#ifndef CURL_DISABLE_DIGEST_AUTH ++ if(!Curl_safecmp(data->state.envproxy, proxy)) { ++ /* proxy changed */ ++ Curl_auth_digest_cleanup(&data->state.proxydigest); ++ free(data->state.envproxy); ++ data->state.envproxy = strdup(proxy); ++ } ++#endif + /* force this connection's protocol to become HTTP if compatible */ + if(!(conn->handler->protocol & PROTO_FAMILY_HTTP)) { + if((conn->handler->flags & PROTOPT_PROXY_AS_HTTP) && +diff --git a/lib/urldata.h b/lib/urldata.h +index 4fc595a..d2d9424 100644 +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -1247,6 +1247,7 @@ struct UrlState { + void (*prev_signal)(int sig); + #endif + #ifndef CURL_DISABLE_DIGEST_AUTH ++ char *envproxy; /* last proxy string used for proxy-related state */ + struct digestdata digest; /* state data for host Digest auth */ + struct digestdata proxydigest; /* state data for proxy Digest auth */ + #endif diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index 076c875..6539f7f 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb @@ -49,6 +49,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2026-92388-1.patch \ file://CVE-2026-92388-2.patch \ file://CVE-2026-87864.patch \ + file://CVE-2026-8927.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 20 13:04:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 105068 Received: from aer-iport-2.cisco.com (aer-iport-2.cisco.com [173.38.203.52]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.5460.1795179858007862216 for ; Fri, 20 Nov 2026 05:04:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=DTsJKWIB; spf=pass (domain: cisco.com, ip: 173.38.203.52, mailfrom: devanshp@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=9503; q=dns/txt; s=iport01; t=1795179858; x=1796389458; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1gwuxIpIzjwLV3gplO1wSNd46IQMANuyuJmbmKW7O1I=; b=DTsJKWIBknvOZoibvXgT7ErXOejH33VjmweO8eOo8m7vLctYg/nX9J9C Ghzpwui+tL0BmJOenzXuM4y+Torrod4WivcK2ymiOcBzEw+antAGANIlx lbxtFbcKCf76RccEylIf61L7Ou7oz16qkiKS4Qjv8uExHBI1F02HSPBRe lzD7bxzuzGtXDpdQRcpkMRwIiD0ZyYtnNywVFX0quhhTRPnXkgbCAMj7R LihjQfkNMyA1o/OP1Lz5CXsAiDnvzEe+swALNinRf6H1G8SMz0EqJ2WKp uzZ01Ws9Y4ixyDufIh0iPWOE31fHV4pnki8QSeW+R7ljIxdTVmAsZIS0y A==; X-CSE-ConnectionGUID: yemrc/rpRYmmyKbiLI/cXg== X-CSE-MsgGUID: xDUY61iXQVOCvyYgFEO3LQ== X-IPAS-Result: A0BJAgAxRABr/9RK/pBRCYJZgld1YUJJlCqCIQOeKYF+DwEBAQ9EDQQBAYUFAo4hAiY0CQ4BAgQDAgMBAQEBAQEBAQEBAQEKAQEFAQEBAgEHBYEOE4ZPDZASAQIBAycLARgBPRwDAQIZFisjCBmDAgGCdAIBEQa4Shs3gXkzgQGDKQExBQkCAkABUNszAQsUAYE4hUKIJF0YAYR9JxsbgXKEf4EFgVwCAQEYgRp8hXYEgg0VgQyBVB5kCYIXiVsaAoFPgVuGS0iBHgNZLAFVEw0KCwcFgWgDNRIqFW4yHYEjOxeBBxsGBYEcgR6BEoEDXYErKF4hgQiBdgKCUYIAAgFJQQ4HRVMJJUMSRyQiCBIJARMaLAqBGjU8CSY/FQxnCxoFYQgCDQx0ORAwHiQvBRomPhsKgQwnHx4bDgIfEAYNGA1IESw3FRkEPm4Hk2yDFwIBFUstASkCf4E7AQIMARSTAwqQFYIhoREKKIN5jCSVOhozqnKZCI4KlgRNhGqBaDyBWXAVO4JnCRY0GQ+OLgsLg2CFE4Etx3kiIzUCCTIBAQcCBw4DC4FokCaBWAEB IronPort-Data: A9a23:bMn5UK6YL2Uf4gbrr3h60AxRtGzGchMFZxGqfqrLsTDasY5as4F+v mVNWD+AOv+La2OgL94iO4Tk/UsB7ZSBm4IyGwVrq39gZn8b8sCt6fZ1gavT04J+CuWZESqLO u1HMoGowPgcFyGa+1H1dOi78BGQ7InQLpLkEunIJyttcgFtTSYlmHpLlvUw6mJSqYDR7zil5 5Wo/KUzBHf/g2QqaztOs/vZwP9SlK2aVA0w7wRWic9j5Dcyp1FNZLoDKKe4KWfPQ4U8NoaSW +bZwbilyXjS9hErB8nNuu6TnpoiG+O60aCm0xK6aoD66vRwjnVaPpUTaJLwXXxqZwChxLid/ jniWauYEm/FNoWU8AgUvoIx/ytWZcWq85efSZSzXFD6I0DuKxPRL/tS4E4eLIAd4O0wG3l0x PkdORMHbzSiwOmGz+fuIgVsrpxLwMjDNY4F/3UlxjbDALN/GNbIQr7B4plT2zJYasJmRKqCI ZBENXwwMFKaOkcn1lQ/UPrSmM+ki2f2dSZYsHqepLE85C7YywkZPL3FboCPI43XH5U9ckCwt k77zjqgAyEjCvu01yu0/VyBobTrpHauMG4VPPjinhJwu3WU3mEVBRgcWFe3rPX8gUmkVvpbK lcI4WwptaU0+UmhQ9XxUhH+p2SL1iPwQPJZHvd/7ESGzbDZpl/AQGMFVTVGLtchsafaWAAX6 7NApPuxbRQHjVFfYSv1Gmu8xd9qBRUoEA== IronPort-HdrOrdr: A9a23:NCIazKmZwJEmJShtyguI+Vbzv2jpDfIA3DAbv31ZSRFFG/Fw8P re+MjzuiWbtN98YhwdcJW7Scq9qBDnhPtICPcqXItKNTOO0ADDEGgh1/qB/9SKIULDH4BmuZ uIC5IfNPTASX5nkM39/A60V/wkwNWB7eSUoN229QYLcemvAJsQljuQzW2gYytLeDU= X-Talos-CUID: 9a23:c1mnA2rj4FboG/qDK5SBBMTmUdEod2fWi23IGX69DHdKQryxaBibyKwxxg== X-Talos-MUID: 9a23:yEY4SgWOXjuOgO3q/C/AuQA8bcZY2pqJI14coJoolu7fERUlbg== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,223,1787011200"; d="scan'208";a="62219528" Received: from aer-l-core-11.cisco.com ([144.254.74.212]) by aer-iport-2.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 20 Nov 2026 13:04:15 +0000 Received: from sjc-ads-8099.cisco.com (sjc-ads-8099.cisco.com [171.68.208.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aer-l-core-11.cisco.com (Postfix) with ESMTPS id 6FCCD1800040B for ; Fri, 20 Nov 2026 13:04:15 +0000 (GMT) Received: by sjc-ads-8099.cisco.com (Postfix, from userid 1887503) id 23B25CBF202; Fri, 20 Nov 2026 05:04:14 -0800 (PST) From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-core@lists.openembedded.org Subject: [OE-Core][scarthgap][PATCH 2/4] curl: Fix CVE-2026-8932 Date: Fri, 20 Nov 2026 05:04:12 -0800 Message-Id: <20261120130414.822854-3-devanshp@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com> References: <20261120130414.822854-1-devanshp@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-8099.cisco.com [171.68.208.137];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 171.68.208.137, sjc-ads-8099.cisco.com X-Outbound-Node: aer-l-core-11.cisco.com 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 13:04:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250781 From: Devansh Patel 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/7541ae569d82fb308a5e2d94916027da4fa3ba3e [2] https://curl.se/docs/CVE-2026-8932.html [3] https://www.cve.org/CVERecord?id=CVE-2026-8932 Signed-off-by: Devansh Patel --- .../curl/curl/CVE-2026-8932.patch | 170 ++++++++++++++++++ meta/recipes-support/curl/curl_8.7.1.bb | 1 + 2 files changed, 171 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-8932.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-8932.patch b/meta/recipes-support/curl/curl/CVE-2026-8932.patch new file mode 100644 index 0000000..c7a6c4f --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-8932.patch @@ -0,0 +1,170 @@ +From 8b62ee5391b03f780223bfc0780c9e14f01d34f2 Mon Sep 17 00:00:00 2001 +From: Joshua Rogers +Date: Tue, 19 May 2026 11:47:50 +0200 +Subject: [PATCH] tls: fix incomplete mTLS config in conn reuse and session + cache + +cert_type, key, key_type, key_passwd and key_blob lived in +ssl_config_data but not in ssl_primary_config, so they were invisible to +match_ssl_primary_config() and to the TLS session cache peer key. + +Two easy handles sharing a connection pool could reuse each other's +authenticated connections when they differed only on SSLKEY, SSLKEYTYPE, +KEYPASSWD, SSLCERTTYPE or SSLKEYBLOB. The second handle would silently +inherit the first handle's authenticated identity. + +Promote all five fields into ssl_primary_config so the conn-reuse +predicate and session cache key cover the complete client credential +set. Also replace the fixed ":CCERT" session cache marker with the +actual clientcert path so sessions are not shared across different +client certificates. + +Verified by test 3303 and 3304 + +Reported-By: Joshua Rogers (AISLE Research) +Closes #21667 + +CVE: CVE-2026-8932 +Upstream-Status: Backport [https://github.com/curl/curl/commit/7541ae569d82fb308a5e2d94916027da4fa3ba3e] + +Backport Changes: +- Add the credential fields in upstream order and initialize primary + directly. Retain the old ssl_config_data fields as backend aliases. + The omitted lib/ldap.c, lib/vssh/{libssh,libssh2}.c and lib/vtls/ + {gtls,mbedtls,openssl,rustls,schannel,wolfssl}.c hunks only relocate + equivalent credential reads. Use the old Curl_safefree name. +- Apply session isolation through the existing vtls.c primary-config + clone/match paths. 8.7.1 lacks lib/vtls/vtls_scache.{c,h}; its cache + already compares the actual clientcert path, without a peer-key API. +- Omit tests/data/{Makefile.am,test3303,test3304} and + tests/unit/{Makefile.inc,unit3303.c,unit3304.c}. + +Signed-off-by: Devansh Patel +--- + lib/urldata.h | 5 +++++ + lib/vtls/vtls.c | 47 ++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 41 insertions(+), 11 deletions(-) + +diff --git a/lib/urldata.h b/lib/urldata.h +index d2d9424..957fef7 100644 +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -290,9 +290,14 @@ struct ssl_primary_config { + char *cipher_list13; /* list of TLS 1.3 cipher suites to use */ + char *pinned_key; + char *CRLfile; /* CRL to check certificate revocation */ ++ char *cert_type; /* format for certificate (default: PEM) */ ++ char *key; /* private key filename */ ++ char *key_type; /* format for private key (default: PEM) */ ++ char *key_passwd; /* plain text private key password */ + struct curl_blob *cert_blob; + struct curl_blob *ca_info_blob; + struct curl_blob *issuercert_blob; ++ struct curl_blob *key_blob; + #ifdef USE_TLS_SRP + char *username; /* TLS username (for, e.g., SRP) */ + char *password; /* TLS password (for, e.g., SRP) */ +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index d13a3cb..969a8a2 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -187,6 +187,7 @@ match_ssl_primary_config(struct Curl_easy *data, + blobcmp(c1->cert_blob, c2->cert_blob) && + blobcmp(c1->ca_info_blob, c2->ca_info_blob) && + blobcmp(c1->issuercert_blob, c2->issuercert_blob) && ++ blobcmp(c1->key_blob, c2->key_blob) && + Curl_safecmp(c1->CApath, c2->CApath) && + Curl_safecmp(c1->CAfile, c2->CAfile) && + Curl_safecmp(c1->issuercert, c2->issuercert) && +@@ -199,7 +200,11 @@ match_ssl_primary_config(struct Curl_easy *data, + strcasecompare(c1->cipher_list13, c2->cipher_list13) && + strcasecompare(c1->curves, c2->curves) && + strcasecompare(c1->CRLfile, c2->CRLfile) && +- strcasecompare(c1->pinned_key, c2->pinned_key)) ++ strcasecompare(c1->pinned_key, c2->pinned_key) && ++ curl_strequal(c1->cert_type, c2->cert_type) && ++ Curl_safecmp(c1->key, c2->key) && ++ curl_strequal(c1->key_type, c2->key_type) && ++ !Curl_timestrcmp(c1->key_passwd, c2->key_passwd)) + return TRUE; + + return FALSE; +@@ -234,6 +239,7 @@ static bool clone_ssl_primary_config(struct ssl_primary_config *source, + CLONE_BLOB(cert_blob); + CLONE_BLOB(ca_info_blob); + CLONE_BLOB(issuercert_blob); ++ CLONE_BLOB(key_blob); + CLONE_STRING(CApath); + CLONE_STRING(CAfile); + CLONE_STRING(issuercert); +@@ -243,6 +249,10 @@ static bool clone_ssl_primary_config(struct ssl_primary_config *source, + CLONE_STRING(pinned_key); + CLONE_STRING(curves); + CLONE_STRING(CRLfile); ++ CLONE_STRING(cert_type); ++ CLONE_STRING(key); ++ CLONE_STRING(key_type); ++ CLONE_STRING(key_passwd); + #ifdef USE_TLS_SRP + CLONE_STRING(username); + CLONE_STRING(password); +@@ -263,8 +273,13 @@ static void Curl_free_primary_ssl_config(struct ssl_primary_config *sslc) + Curl_safefree(sslc->cert_blob); + Curl_safefree(sslc->ca_info_blob); + Curl_safefree(sslc->issuercert_blob); ++ Curl_safefree(sslc->key_blob); + Curl_safefree(sslc->curves); + Curl_safefree(sslc->CRLfile); ++ Curl_safefree(sslc->cert_type); ++ Curl_safefree(sslc->key); ++ Curl_safefree(sslc->key_type); ++ Curl_safefree(sslc->key_passwd); + #ifdef USE_TLS_SRP + Curl_safefree(sslc->username); + Curl_safefree(sslc->password); +@@ -291,12 +306,17 @@ CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data) + data->set.ssl.primary.username = data->set.str[STRING_TLSAUTH_USERNAME]; + data->set.ssl.primary.password = data->set.str[STRING_TLSAUTH_PASSWORD]; + #endif +- data->set.ssl.cert_type = data->set.str[STRING_CERT_TYPE]; +- data->set.ssl.key = data->set.str[STRING_KEY]; +- data->set.ssl.key_type = data->set.str[STRING_KEY_TYPE]; +- data->set.ssl.key_passwd = data->set.str[STRING_KEY_PASSWD]; ++ data->set.ssl.primary.cert_type = data->set.str[STRING_CERT_TYPE]; ++ data->set.ssl.primary.key = data->set.str[STRING_KEY]; ++ data->set.ssl.primary.key_type = data->set.str[STRING_KEY_TYPE]; ++ data->set.ssl.primary.key_passwd = data->set.str[STRING_KEY_PASSWD]; + data->set.ssl.primary.clientcert = data->set.str[STRING_CERT]; +- data->set.ssl.key_blob = data->set.blobs[BLOB_KEY]; ++ data->set.ssl.primary.key_blob = data->set.blobs[BLOB_KEY]; ++ data->set.ssl.cert_type = data->set.ssl.primary.cert_type; ++ data->set.ssl.key = data->set.ssl.primary.key; ++ data->set.ssl.key_type = data->set.ssl.primary.key_type; ++ data->set.ssl.key_passwd = data->set.ssl.primary.key_passwd; ++ data->set.ssl.key_blob = data->set.ssl.primary.key_blob; + + #ifndef CURL_DISABLE_PROXY + data->set.proxy_ssl.primary.CApath = data->set.str[STRING_SSL_CAPATH_PROXY]; +@@ -316,12 +336,17 @@ CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data) + data->set.blobs[BLOB_SSL_ISSUERCERT_PROXY]; + data->set.proxy_ssl.primary.CRLfile = + data->set.str[STRING_SSL_CRLFILE_PROXY]; +- data->set.proxy_ssl.cert_type = data->set.str[STRING_CERT_TYPE_PROXY]; +- data->set.proxy_ssl.key = data->set.str[STRING_KEY_PROXY]; +- data->set.proxy_ssl.key_type = data->set.str[STRING_KEY_TYPE_PROXY]; +- data->set.proxy_ssl.key_passwd = data->set.str[STRING_KEY_PASSWD_PROXY]; ++ data->set.proxy_ssl.primary.cert_type = data->set.str[STRING_CERT_TYPE_PROXY]; ++ data->set.proxy_ssl.primary.key = data->set.str[STRING_KEY_PROXY]; ++ data->set.proxy_ssl.primary.key_type = data->set.str[STRING_KEY_TYPE_PROXY]; ++ data->set.proxy_ssl.primary.key_passwd = data->set.str[STRING_KEY_PASSWD_PROXY]; + data->set.proxy_ssl.primary.clientcert = data->set.str[STRING_CERT_PROXY]; +- data->set.proxy_ssl.key_blob = data->set.blobs[BLOB_KEY_PROXY]; ++ data->set.proxy_ssl.primary.key_blob = data->set.blobs[BLOB_KEY_PROXY]; ++ data->set.proxy_ssl.cert_type = data->set.proxy_ssl.primary.cert_type; ++ data->set.proxy_ssl.key = data->set.proxy_ssl.primary.key; ++ data->set.proxy_ssl.key_type = data->set.proxy_ssl.primary.key_type; ++ data->set.proxy_ssl.key_passwd = data->set.proxy_ssl.primary.key_passwd; ++ data->set.proxy_ssl.key_blob = data->set.proxy_ssl.primary.key_blob; + #ifdef USE_TLS_SRP + data->set.proxy_ssl.primary.username = + data->set.str[STRING_TLSAUTH_USERNAME_PROXY]; diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index 6539f7f..144a5c2 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb @@ -50,6 +50,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2026-92388-2.patch \ file://CVE-2026-87864.patch \ file://CVE-2026-8927.patch \ + file://CVE-2026-8932.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 20 13:04:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 105069 Received: from aer-iport-2.cisco.com (aer-iport-2.cisco.com [173.38.203.52]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.5460.1795179858007862216 for ; Fri, 20 Nov 2026 05:04:19 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=DRgxJJIB; spf=pass (domain: cisco.com, ip: 173.38.203.52, mailfrom: devanshp@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=11581; q=dns/txt; s=iport01; t=1795179859; x=1796389459; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=QJsIMAz9N2LPqmSnFXjeXUuBiDcUywgVdEhUSZBUiBs=; b=DRgxJJIBUvFIHPPdb3hFTq4cZ8BBAjPLh4xmv2EGBFcFluOoFu+9Dfrq ODn6om68hM83BKtkX/efNS6Hc8/dj1dTtZn6+HuzRViim8uRzAoC9FGpG V+99i+MEU5VRn0MMFjJSf7iTFXpVRkE9fMsKP9Zbteat/YV2o5uD77k1j l+iEXzSy/+xx+J8zIoAniiC7emMbBkisRd6/7h5tP+LqCAT3GVGZeA4Vz gDvjQb+O9XEugwOoxePa/CFkWmNOFVLiiiF3UuUOBHZXS/CbXNt3Hk3sY HbNkTo3nRzsYIC7pGKx3YjW6/nFlwGTP4MnxzxYmRc06nrg5hbrHUiLZq Q==; X-CSE-ConnectionGUID: aT231uUIR8KMPHRH05FEbQ== X-CSE-MsgGUID: FRyymU4tQOWe9QTAo4DXZw== X-IPAS-Result: A0BJAgAxRABr/9NK/pBaglmCV3VhQkmUKoIhA4ETnRaBfg8BAQEPRA0EAQGFBQKOIQImNAkOAQIEAwIDAQEBAQEBAQEBAQEBCgEBBQEBAQIBBwWBDhOGTw2QEgECAQMnCwEYAT0cAwECLysjCBAJgwIBgnQCAREGuEobN4F5M4EBgykBMQUJAgJAAVDbMwELFAGBOIVCiCRdGAGEfScbG4FygRWCdHaBBYFcAgEBGIgMBIIigQyBVB6MeQKBT4gmSIEeA1ksAVUTDQoLBwWBaAM1EioVbjIdgSM7F4EHGwYFgRyBHoESgQNdgSsoXiGBCIF2AoJRggACAUlBDgdFUwklQxJHJCIIEgkBExosCoEaNTwJJj8VDGcLGgVhCAINDHQ5EDAeJC8FGiY+GwqBDCcfHhsOAh8QBg0YDUgRLDcVGQQ+bgeTbIJ5IB9CLQETFQEBAX8GeAc5CwIckn0BB5I2oREKKIN5jCSVOhozhVulF5kIjgqWUYRqgWg8gVlwFYMiCRY0GQ+OOYIDgWiFE4EtyBsjNQIJMgEBBwIHDgMLgWiRfgEB IronPort-Data: A9a23:kiiDMajyota3Z01lnPk/0Z3tX161NBEKZh0ujC45NGQN5FlHY01je htvUGHTOfmNamakLYgibo/g9EJS7ZbTxtM1HgQ++CBnE3ljpJueD7x1DKtf0wB+jyHnZBg6h ynLQoCYdKjYdleF+FHwdOCn/SMhvU2xbuKUIPbePSxsThNTRi4kiBZy88Y0mYcAbeKRW2thg vus5ZeAULOZ82QsaDxNsvjb8UkHUMna4Vv0gHRvPZing3eG/5UlJMp3Db28KXL+Xr5VEoaSL 87fzKu093/u5BwkDNWoiN7TKiXmlZaLYGBiIlIPM0STqkAqSh4ai87XB9JAAatjsAhlqvgqo Dl7WTNcfi9yVkHEsLx1vxC1iEiSN4UekFPMCSDXXcB+UyQqflO0q8iCAn3aMqURxrwsWHxz1 MZICxU1Tiqj37+Y7biCH7wEasQLdKEHPasWt2slyXTSCuwrBMmbBa7L/tRfmjw3g6iiH96HO 5ZfM2czKkucJUcWYz/7C7pm9AusrnXybTRes1KNjaE2+GPUigd21dABNfKLIIbTFJgPzy50o EroxXXoByxGKOW49jfUy06FgbPjrRHkDdd6+LqQs6QCbEeo7msLBRsbUFG2rfW0hgu1XMhSA 0gV4TY1668q+UqmS9PwUxG1rDiDpBF0ZjZLO+Q38kSJj6HT+QvcXzBCRT9aY9tgv8gzLdA36 mK0cxrSLWQHmNWopbi1rN94cRva1fApEFI/ IronPort-HdrOrdr: A9a23:EZlAgagYkyTO+KGW/pFKcoc823BQXvYji2hC6mlwRA09TyX+rb HLoB1173HJYVoqNU3I3OrwW5VoIkmskKKdn7NxAV7KZmCP0wGVxcNZnOnfKlbbdBEWmNQw6U 4ZSchDIey1K0RmhsDn5wT9OdMhzN6btJ2Mv47lvhBQpcUAUdAY0++/YTzrdHFLeA== X-Talos-CUID: 9a23:0shCkWO8RIXBrO5DURU9rxcJJ+EfIl749FfqAxflJ0tjcejA X-Talos-MUID: 9a23:eUwCnA1luCPkj2DGr3rD9Ev/4DUjzZ6/GUUwzYk/nPaJZBVMEjDBoASFXdpy X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,223,1787011200"; d="scan'208";a="62219529" Received: from aer-l-core-10.cisco.com ([144.254.74.211]) by aer-iport-2.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 20 Nov 2026 13:04:15 +0000 Received: from sjc-ads-8099.cisco.com (sjc-ads-8099.cisco.com [171.68.208.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aer-l-core-10.cisco.com (Postfix) with ESMTPS id 74837180001E9 for ; Fri, 20 Nov 2026 13:04:15 +0000 (GMT) Received: by sjc-ads-8099.cisco.com (Postfix, from userid 1887503) id 27727CBF203; Fri, 20 Nov 2026 05:04:14 -0800 (PST) From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" 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 Message-Id: <20261120130414.822854-4-devanshp@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com> References: <20261120130414.822854-1-devanshp@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-8099.cisco.com [171.68.208.137];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 171.68.208.137, sjc-ads-8099.cisco.com X-Outbound-Node: aer-l-core-10.cisco.com 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 13:04:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250782 From: Devansh Patel 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 --- .../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 +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 +--- + 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 +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 +--- + 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 +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 +--- + 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 = " \ From patchwork Fri Nov 20 13:04:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 105067 Received: from aer-iport-4.cisco.com (aer-iport-4.cisco.com [173.38.203.54]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.5426.1795179857994325358 for ; Fri, 20 Nov 2026 05:04:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=Id1CiHE2; spf=pass (domain: cisco.com, ip: 173.38.203.54, mailfrom: devanshp@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=4327; q=dns/txt; s=iport01; t=1795179858; x=1796389458; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=JJTLWx/+tk7t46msOZADD59d5dlP0ktEutQVwZhj0lk=; b=Id1CiHE2xoYWX8hoboR4F+VbEoSjnmcvrIp1qghIFb6A1uyKq2zcRKk8 JpFDp82xBOBPoUl/ipl/oC/Hi9CCWTMMVpj6ZCT8VQt+AKEUuF2LQVTNl gm81XlsUUMnc2ei63WWnxYjsVEH+f7VtRnsI/T5SOa9UyVI0ljiFfBqvs ogqtXf9YVWgCCItx9RtRLxVGltllAxQ6yfymQqrpTQPeL+25BVtZ45sCy Q15qza9BZ8oPbOvbtULZpCIK1k9ue7Pdpmm2wDbty6oiE+I+8DTsHvUwF 94IazQJUy3d34LWZEeuTUnyLWhCgda00ykex33rE3AqITB+1lgT71CmAX w==; X-CSE-ConnectionGUID: gKN8uzC4TSS03fqAlVJ2UQ== X-CSE-MsgGUID: +rmTOW60SeSiOcRx04cQFA== X-IPAS-Result: A0BIAgAxRABr/9FK/pBaglmCV3VhQkmUKoIhA54pgX4PAQEBD0QNBAEBhQUCjiECJjQJDgECBAMCAwEBAQEBAQEBAQEBAQoBAQUBAQECAQcFgQ4Thk8NkBIBAgEDJwsBGAE9HAMBAi8rIwgZgwIBgnQCAREGuEobN4F5M4EBgykBMQUJAgJAAVDbMwELFAGBOIVCiCRdGAGEfScbG4FygRWDaoEFgVwCAQEYiAwEgiKBDIFUHox5AoFPiCZIgR4DWSwBVRMNCgsHBYFoAzUSKhVuMh2BIzsXgQcbBgWBHIEegRKBA12BKyheIYEIgXYCglGCAAIBSUEOB0VTCSVDEkckIggSCQETGiwKgRo1PAkmPxUMZwsaBWEIAg0MdDkQMB4kLwUaJj4bCoEMJx8eGw4CHxAGDRgNSBEsNxUZBD5uB5NsgxIHWgctASkCgVdmKaU7oREKKIN5jCSVOhozqnKZCI4KlWlohGqBaDyBWXAVgyIJFjQZD44uCwuDYIUTgS3IGyM1AgkyAQEHAgcOAwuBaJF+AQE IronPort-Data: A9a23:25U68K+mc6qBBwbVpwz8DrUD1H+TJUtcMsCJ2f8bNWPcYEJGY0x3m jFKWTiFbP3eNDGke9p2PIXj9k4FsJGBm4Q1HVE6rCtEQiMRo6IpJzg2wmQcns+2BpeeJK6yx 5xGMrEsFOhtEDmB4E/rYuK8xZVF/fngbqLmD+LZMTxGSwZhSSMw4TpugOdRbrRA2bBVOCvT/ 4mtyyHjEAX9gWAtazhMsvjrRC5H5ZwehhtJ5jTSWtgT1LPuvyF9JI4SI6i3M0z5TuF8dsamR /zOxa2O5WjQ+REgELuNyt4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5nXBYoUnq7vh3S9zxHJ HqhgrTrIeshFvWkdO3wyHC0GQkmVUFN0OevzXRSLaV/wmWeG0YAzcmCA2k5HqtI5/RcXV11z qRDJikkai6h3d+PlefTpulE3qzPLeHiMZlavjRryivUSK52B5vCWK7No9Rf2V/chOgXQaqYP ZdFL2UzKk6YMnWjOX9PYH46tOulmHD5aD1AgFmUvqEwpWPUyWSd1ZCzaoOFI4LaGq25mG7bv Gf62FunWioXD924wgCVqi6nv8HmyHaTtIU6UefQGuRRqFqLy2oeDRcbWVe2rbyyjVSzc9ZeM FAPvC02oK4/8UamQtXwU1u/unHsg/IHc9NdCag+rQqK0KeRu1bfDWkfRTkHY9sj3CMreQEXO payt4uBLVRSXHe9EBpxKp/8QeuOBBUo IronPort-HdrOrdr: A9a23:y3ksYaxZrDCJlW5IU3hWKrPwAL1zdoMgy1knxilNoHtuA6ilfq +V8sjzuSWYtN9VYgBCpTniAtjkfZqjz/9ICOAqVN/INjUO+lHYTr2KhrGM/9SPIUHDH5ZmtZ tIQuxZFMD6C0R8gILR5Qm1FMtl/fy8mZrY4ts3CxxWPHhXg2YK1XYeNjqm X-Talos-CUID: 9a23:x6xDzWGId/6BE/+JqmJo12hEB9IOLkHm9y+LLVaRDVhLEoCsHAo= X-Talos-MUID: 9a23:UoOnTwX00vk6ZqTq/Hz2gQ1FC5kw2KmVCWcGq4Ve58K9GwUlbg== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,223,1787011200"; d="scan'208";a="62181687" Received: from aer-l-core-08.cisco.com ([144.254.74.209]) by aer-iport-4.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 20 Nov 2026 13:04:15 +0000 Received: from sjc-ads-8099.cisco.com (sjc-ads-8099.cisco.com [171.68.208.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aer-l-core-08.cisco.com (Postfix) with ESMTPS id 760A718000199 for ; Fri, 20 Nov 2026 13:04:15 +0000 (GMT) Received: by sjc-ads-8099.cisco.com (Postfix, from userid 1887503) id 2AF1ECBF204; Fri, 20 Nov 2026 05:04:14 -0800 (PST) From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-core@lists.openembedded.org Subject: [OE-Core][scarthgap][PATCH 4/4] curl: Fix CVE-2026-7168 Date: Fri, 20 Nov 2026 05:04:14 -0800 Message-Id: <20261120130414.822854-5-devanshp@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com> References: <20261120130414.822854-1-devanshp@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-8099.cisco.com [171.68.208.137];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 171.68.208.137, sjc-ads-8099.cisco.com X-Outbound-Node: aer-l-core-08.cisco.com 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 13:04:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250779 From: Devansh Patel 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/c1cfdf59acbaf9504c4578d4cf56cdd7c8594507 [2] https://curl.se/docs/CVE-2026-7168.html [3] https://www.cve.org/CVERecord?id=CVE-2026-7168 Signed-off-by: Devansh Patel --- .../curl/curl/CVE-2026-7168.patch | 83 +++++++++++++++++++ meta/recipes-support/curl/curl_8.7.1.bb | 1 + 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-7168.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-7168.patch b/meta/recipes-support/curl/curl/CVE-2026-7168.patch new file mode 100644 index 0000000..cc12db0 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-7168.patch @@ -0,0 +1,83 @@ +From 2b1d18e42252aa09236666f0469b48a0e1f95080 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 27 Apr 2026 09:14:51 +0200 +Subject: [PATCH] setopt: clear proxy auth properties when switching + +Verify with test 1588 + +Closes #21453 + +CVE: CVE-2026-7168 +Upstream-Status: Backport [https://github.com/curl/curl/commit/c1cfdf59acbaf9504c4578d4cf56cdd7c8594507] + +Backport Changes: +- Place setproxy() beside Curl_setstropt() and call it from the old + Curl_vsetopt CURLOPT_PROXY case; 8.7.1 has no setopt_cptr_proxy(). + Add CURL_DISABLE_PROXY protection because this helper is outside + the upstream proxy-only section in the older monolithic file. + Keep the upstream Digest-disabled cleanup macro in vauth/vauth.h. +- Omit tests/data/{Makefile.am,test1588} and + tests/libtest/{Makefile.inc,lib1588.c}. + +Signed-off-by: Devansh Patel +--- + lib/setopt.c | 18 ++++++++++++++++-- + lib/vauth/vauth.h | 2 ++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/lib/setopt.c b/lib/setopt.c +index 8a5a5d7..7eaf309 100644 +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -51,6 +51,7 @@ + #include "altsvc.h" + #include "hsts.h" + #include "tftp.h" ++#include "vauth/vauth.h" + #include "strdup.h" + /* The last 3 #include files should be in this order */ + #include "curl_printf.h" +@@ -76,6 +77,20 @@ CURLcode Curl_setstropt(char **charp, const char *s) + return CURLE_OK; + } + ++#ifndef CURL_DISABLE_PROXY ++static CURLcode setproxy(struct Curl_easy *data, const char *proxy) ++{ ++ if((data->set.str[STRING_PROXY] && proxy) && ++ /* there was one set, is this a new one? */ ++ !strcmp(data->set.str[STRING_PROXY], proxy)) ++ return CURLE_OK; /* same one as before */ ++ ++ Curl_auth_digest_cleanup(&data->state.proxydigest); ++ memset(&data->state.authproxy, 0, sizeof(data->state.authproxy)); ++ return Curl_setstropt(&data->set.str[STRING_PROXY], proxy); ++} ++#endif ++ + CURLcode Curl_setblobopt(struct curl_blob **blobp, + const struct curl_blob *blob) + { +@@ -1139,8 +1154,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) + * Setting it to NULL, means no proxy but allows the environment variables + * to decide for us (if CURLOPT_SOCKS_PROXY setting it to NULL). + */ +- result = Curl_setstropt(&data->set.str[STRING_PROXY], +- va_arg(param, char *)); ++ result = setproxy(data, va_arg(param, char *)); + break; + + case CURLOPT_PRE_PROXY: +diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h +index 9da0540..bf5c7a3 100644 +--- a/lib/vauth/vauth.h ++++ b/lib/vauth/vauth.h +@@ -119,6 +119,8 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, + + /* This is used to clean up the digest specific data */ + void Curl_auth_digest_cleanup(struct digestdata *digest); ++#else ++#define Curl_auth_digest_cleanup(x) + #endif /* !CURL_DISABLE_DIGEST_AUTH */ + + #ifdef USE_GSASL diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index e365c68..0149a6f 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb @@ -54,6 +54,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2026-6429_p1.patch \ file://CVE-2026-6429_p2.patch \ file://CVE-2026-6429_p3.patch \ + file://CVE-2026-7168.patch \ " SRC_URI:append:class-nativesdk = " \