Skip to contentSkip to conversation

curl: Backport CVE fixes

PATCH New Robert Joslyn 1 participant 1 message Nov 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 curl: Backport CVE fixes

Backport fixes for:
- CVE-2022-32221 POST following PUT confusion
- CVE-2022-35260 .netrc parser out-of-bounds access
- CVE-2022-42915 HTTP proxy double-free
- CVE-2022-42916 HSTS bypass via IDN

---
 .../curl/curl/CVE-2022-32221.patch            |  27 ++++
 .../curl/curl/CVE-2022-35260.patch            |  73 ++++++++++
 .../curl/curl/CVE-2022-42915.patch            |  53 +++++++
 .../curl/curl/CVE-2022-42916.patch            | 134 ++++++++++++++++++
 meta/recipes-support/curl/curl_7.85.0.bb      |   4 +
 5 files changed, 291 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2022-32221.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2022-35260.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2022-42915.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2022-42916.patch
meta/recipes-support/curl/curl/CVE-2022-32221.patch new file +27 -0
new file mode 100644
index 0000000000..03a7ac513b
@@ -0,0 +1,27 @@
+From dd31455d46dcf9e3a1b8bd37e671af1a6af52807 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Thu, 15 Sep 2022 09:22:45 +0200
+Subject: [PATCH] setopt: when POST is set, reset the 'upload' field
+
+Reported-by: RobBotic1 on github
+Fixes #9507
+Closes #9511
+
+Upstream-Status: Backport [https://github.com/curl/curl/commit/a64e3e59938abd7d6]
+Signed-off-by: Robert Joslyn <[email protected]>
+---
+ lib/setopt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/setopt.c b/lib/setopt.c
+index d5e3b50..b8793b4 100644
+--- a/lib/setopt.c
++++ b/lib/setopt.c
+@@ -696,6 +696,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
+     }
+     else
+       data->set.method = HTTPREQ_GET;
++    data->set.upload = FALSE;
+     break;
+ 
+   case CURLOPT_HTTPPOST:
meta/recipes-support/curl/curl/CVE-2022-35260.patch new file +73 -0

73 lines not on this page · raw message

meta/recipes-support/curl/curl/CVE-2022-42915.patch new file +53 -0

53 lines not on this page · raw message

meta/recipes-support/curl/curl/CVE-2022-42916.patch new file +134 -0

134 lines not on this page · raw message

meta/recipes-support/curl/curl_7.85.0.bb +4 -0
index ad6a5175bc..0386052bf4 100644
@@ -13,6 +13,10 @@ SRC_URI = " \
     https://curl.se/download/${BP}.tar.xz \
     file://run-ptest \
     file://disable-tests \
+    file://CVE-2022-32221.patch \
+    file://CVE-2022-35260.patch \
+    file://CVE-2022-42915.patch \
+    file://CVE-2022-42916.patch \
 "
 SRC_URI[sha256sum] = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6"
 
Signature · 1 line
2.37.4