All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)" <devanshp@cisco.com>
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	[thread overview]
Message-ID: <20261120130414.822854-3-devanshp@cisco.com> (raw)
In-Reply-To: <20261120130414.822854-1-devanshp@cisco.com>

From: Devansh Patel <devanshp@cisco.com>

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 <devanshp@cisco.com>
---
 .../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 <MegaManSec@users.noreply.github.com>
+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 <devanshp@cisco.com>
+---
+ 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 = " \

  parent reply	other threads:[~2026-11-20 13:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 13:04 [OE-Core][scarthgap][PATCH 0/4] curl: fix CVE-2026-8927, CVE-2026-8932, CVE-2026-6429 and CVE-2026-7168 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 1/4] curl: Fix CVE-2026-8927 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco) [this message]
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 3/4] curl: Fix CVE-2026-6429 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-11-20 13:04 ` [OE-Core][scarthgap][PATCH 4/4] curl: Fix CVE-2026-7168 Devansh Patel -X (devanshp - E INFOCHIPS PRIVATE LIMITED at Cisco)

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=20261120130414.822854-3-devanshp@cisco.com \
    --to=devanshp@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.