mirror of
https://git.yoctoproject.org/poky
synced 2026-04-10 23:02:25 +02:00
curl: patch CVE-2025-14524
Pick commit per [1]. [1] https://curl.se/docs/CVE-2025-14524.html [2] https://security-tracker.debian.org/tracker/CVE-2025-14524 (From OE-Core rev: 69b98b1f2bd0717b0ab7adcb5d8aa9b84ae2f48b) Signed-off-by: Amaury Couderc <amaury.couderc@est.tech> Signed-off-by: Paul Barker <paul@pbarker.dev> Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> [YC: cherry-picked from scarthgap commit 951113a6e8185969444b5e28292f23434dba1f6c] Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
committed by
Paul Barker
parent
78749ad27d
commit
f6d2fd38dc
42
meta/recipes-support/curl/curl/CVE-2025-14524.patch
Normal file
42
meta/recipes-support/curl/curl/CVE-2025-14524.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
From b3e2318ff3cbe4a9babe5b6875916a429bd584be Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Wed, 10 Dec 2025 11:40:47 +0100
|
||||
Subject: [PATCH] curl_sasl: if redirected, require permission to use bearer
|
||||
|
||||
Closes #19933
|
||||
|
||||
CVE: CVE-2025-14524
|
||||
Upstream-Status: Backport [https://github.com/curl/curl/commit/1a822275d333dc6da6043497160fd04c8fa48640]
|
||||
|
||||
Signed-off-by: Amaury Couderc <amaury.couderc@est.tech>
|
||||
|
||||
---
|
||||
lib/curl_sasl.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
|
||||
index 7e28c92..f0b0341 100644
|
||||
--- a/lib/curl_sasl.c
|
||||
+++ b/lib/curl_sasl.c
|
||||
@@ -345,7 +345,9 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct Curl_easy *data,
|
||||
data->set.str[STRING_SERVICE_NAME] :
|
||||
sasl->params->service;
|
||||
#endif
|
||||
- const char *oauth_bearer = data->set.str[STRING_BEARER];
|
||||
+ const char *oauth_bearer =
|
||||
+ (!data->state.this_is_a_follow || data->set.allow_auth_to_other_hosts) ?
|
||||
+ data->set.str[STRING_BEARER] : NULL;
|
||||
struct bufref nullmsg;
|
||||
|
||||
Curl_bufref_init(&nullmsg);
|
||||
@@ -531,7 +533,9 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data,
|
||||
data->set.str[STRING_SERVICE_NAME] :
|
||||
sasl->params->service;
|
||||
#endif
|
||||
- const char *oauth_bearer = data->set.str[STRING_BEARER];
|
||||
+ const char *oauth_bearer =
|
||||
+ (!data->state.this_is_a_follow || data->set.allow_auth_to_other_hosts) ?
|
||||
+ data->set.str[STRING_BEARER] : NULL;
|
||||
struct bufref serverdata;
|
||||
|
||||
Curl_bufref_init(&serverdata);
|
||||
@@ -70,6 +70,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
|
||||
file://CVE-2025-14017.patch \
|
||||
file://CVE-2025-15079.patch \
|
||||
file://CVE-2025-15224.patch \
|
||||
file://CVE-2025-14524.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user