From: Peter Marko <[email protected]> Pick patch per [1]. Pick also a precondition patch (containing if clause to else which is added by the actual patch). Resolve conflicts in test makefiles caused by differences in available test suites.
[1] https://curl.se/docs/CVE-2026-9546.html Signed-off-by: Peter Marko <[email protected]> Signed-off-by: Yoann Congal <[email protected]> [YC: refreshed patches on Makefile test lists] --- .../curl/curl/CVE-2026-9546-01.patch | 227 ++++++++++++++++++ .../curl/curl/CVE-2026-9546-02.patch | 218 +++++++++++++++++ meta/recipes-support/curl/curl_8.19.0.bb | 2 + 3 files changed, 447 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2026-9546-01.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2026-9546-02.patch diff --git a/meta/recipes-support/curl/curl/CVE-2026-9546-01.patch b/meta/recipes-support/curl/curl/CVE-2026-9546-01.patch new file mode 100644 index 00000000000..74dc7015559 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-9546-01.patch @@ -0,0 +1,227 @@ +From fa057ea3dedb04f93672ec95ee964f1f02ec0ecf Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +Date: Wed, 15 Apr 2026 08:11:33 +0200 +Subject: [PATCH] transfer: clear the old autoreferer + +Verify in test 2505 + +Closes #21322 + +CVE: CVE-2026-9546 +Upstream-Status: Backport [https://github.com/curl/curl/commit/fa057ea3dedb04f93672ec95ee964f1f02ec0ecf] +Signed-off-by: Peter Marko <[email protected]> +--- + lib/setopt.c | 1 - + lib/transfer.c | 5 +++ + tests/data/Makefile.am | 2 +- + tests/data/test2505 | 67 +++++++++++++++++++++++++++++++++++ + tests/libtest/Makefile.inc | 2 +- + tests/libtest/lib2505.c | 71 ++++++++++++++++++++++++++++++++++++++ + 6 files changed, 145 insertions(+), 3 deletions(-) + create mode 100644 tests/data/test2505 + create mode 100644 tests/libtest/lib2505.c + +diff --git a/lib/setopt.c b/lib/setopt.c +index dae4218b70..e832ef1afd 100644 +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -2015,7 +2015,6 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option, + * String to set in the HTTP Referer: field. + */ + result = Curl_setstropt(&s->str[STRING_SET_REFERER], ptr); +- Curl_bufref_set(&data->state.referer, s->str[STRING_SET_REFERER], 0, NULL); + break; + + case CURLOPT_USERAGENT: +diff --git a/lib/transfer.c b/lib/transfer.c +index a2fce9331b..fd1a903dab 100644 +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -535,6 +535,11 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + data->state.authproxy.want = data->set.proxyauth; + Curl_safefree(data->info.wouldredirect); + Curl_data_priority_clear_state(data); ++ if(data->set.http_auto_referer) ++ Curl_bufref_free(&data->state.referer); ++ if(data->set.str[STRING_SET_REFERER]) ++ Curl_bufref_set(&data->state.referer, data->set.str[STRING_SET_REFERER], ++ 0, NULL); + + if(data->state.httpreq == HTTPREQ_PUT) + data->state.infilesize = data->set.filesize; +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index 1e84b26820..238da5331c 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -265,7 +265,7 @@ test2309 \ + \ + test2400 test2401 test2402 test2403 test2404 test2405 test2406 test2407 \ + \ +-test2500 test2501 test2502 test2503 test2504 test2506 \ ++test2500 test2501 test2502 test2503 test2504 test2505 test2506 \ + \ + test2600 test2601 test2602 test2603 test2604 test2605 \ + \ +diff --git a/tests/data/test2505 b/tests/data/test2505 +new file mode 100644 +index 0000000000..8fac590b37 +--- /dev/null ++++ b/tests/data/test2505 +@@ -0,0 +1,67 @@ ++<?xml version="1.0" encoding="US-ASCII"?> ++<testcase> ++<info> ++<keywords> ++HTTP ++referer ++autoreferer ++</keywords> ++</info> ++ ++# Server-side ++<reply> ++<data crlf="headers" nocheck="yes"> ++HTTP/1.1 301 redirect ++Date: Tue, 09 Nov 2010 14:49:00 GMT ++Server: server.example.com ++Content-Length: 47 ++Location: %TESTNUMBER0002 ++ ++file contents should appear once for each file ++</data> ++ ++<data2 crlf="headers" nocheck="yes"> ++HTTP/1.1 200 OK ++Date: Tue, 09 Nov 2010 14:49:00 GMT ++Server: server.example.com ++Content-Length: 47 ++ ++file contents should appear once for each file ++</data2> ++</reply> ++ ++# Client-side ++<client> ++<server> ++http ++</server> ++<tool> ++lib%TESTNUMBER ++</tool> ++<name> ++verify CURLOPT_AUTOREFERER switched off ++</name> ++<command> ++http://%HOSTIP:%HTTPPORT ++</command> ++</client> ++ ++# Verify data after the test has been "shot" ++<verify> ++<protocol crlf="headers"> ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Accept: */* ++ ++GET /%TESTNUMBER0002 HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Accept: */* ++Referer: http://%HOSTIP:%HTTPPORT/ ++ ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Accept: */* ++ ++</protocol> ++</verify> ++</testcase> +diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc +index 249c6fda87..bdf8a1dbea 100644 +--- a/tests/libtest/Makefile.inc ++++ b/tests/libtest/Makefile.inc +@@ -113,7 +113,7 @@ TESTS_C = \ + lib2023.c lib2032.c lib2082.c \ + lib2301.c lib2302.c lib2304.c lib2306.c lib2308.c lib2309.c \ + lib2402.c lib2404.c lib2405.c \ +- lib2502.c lib2504.c lib2506.c \ ++ lib2502.c lib2504.c lib2505.c lib2506.c \ + lib2700.c \ + lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c lib3034.c \ + lib3100.c lib3101.c lib3102.c lib3103.c lib3104.c lib3105.c \ +diff --git a/tests/libtest/lib2505.c b/tests/libtest/lib2505.c +new file mode 100644 +index 0000000000..c170259874 +--- /dev/null ++++ b/tests/libtest/lib2505.c +@@ -0,0 +1,71 @@ ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Linus Nielsen Feltzing <[email protected]> ++ * ++ * 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 "first.h" ++ ++#include "testtrace.h" ++ ++static size_t sink2505(char *ptr, size_t size, size_t nmemb, void *ud) ++{ ++ (void)ptr; ++ (void)ud; ++ return size * nmemb; ++} ++ ++static CURLcode test_lib2505(const char *URL) ++{ ++ CURL *curl; ++ CURLcode result = CURLE_OUT_OF_MEMORY; ++ ++ if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { ++ curl_mfprintf(stderr, "curl_global_init() failed\n"); ++ return TEST_ERR_MAJOR_BAD; ++ } ++ ++ curl = curl_easy_init(); ++ if(!curl) { ++ curl_mfprintf(stderr, "curl_easy_init() failed\n"); ++ curl_global_cleanup(); ++ return TEST_ERR_MAJOR_BAD; ++ } ++ ++ test_setopt(curl, CURLOPT_WRITEFUNCTION, sink2505); ++ test_setopt(curl, CURLOPT_AUTOREFERER, 1L); ++ test_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); ++ test_setopt(curl, CURLOPT_URL, URL); ++ ++ result = curl_easy_perform(curl); ++ curl_mprintf("req1=%d\n", (int)result); ++ ++ test_setopt(curl, CURLOPT_FOLLOWLOCATION, 0L); ++ test_setopt(curl, CURLOPT_URL, URL); ++ ++ result = curl_easy_perform(curl); ++ curl_mprintf("req2=%d\n", (int)result); ++ ++test_cleanup: ++ curl_easy_cleanup(curl); ++ curl_global_cleanup(); ++ ++ return result; ++} diff --git a/meta/recipes-support/curl/curl/CVE-2026-9546-02.patch b/meta/recipes-support/curl/curl/CVE-2026-9546-02.patch new file mode 100644 index 00000000000..d4842824ff7 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-9546-02.patch @@ -0,0 +1,218 @@ +From 862e8a74a84478d82973471b4f49dc2746c1780e Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +Date: Mon, 25 May 2026 16:43:00 +0200 +Subject: [PATCH] transfer: clear referer when set to NULL + +Verify in test 1649 + +Closes #21741 + +CVE: CVE-2026-9546 +Upstream-Status: Backport [https://github.com/curl/curl/commit/862e8a74a84478d82973471b4f49dc2746c1780e] +Signed-off-by: Peter Marko <[email protected]> +--- + lib/transfer.c | 2 + + tests/data/Makefile.am | 2 +- + tests/data/test1649 | 55 +++++++++++++++++++++++ + tests/libtest/Makefile.inc | 2 +- + tests/libtest/lib1649.c | 90 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 149 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test1649 + create mode 100644 tests/libtest/lib1649.c + +diff --git a/lib/transfer.c b/lib/transfer.c +index 9998d2d..9b55913 100644 +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -540,6 +540,8 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + if(data->set.str[STRING_SET_REFERER]) + Curl_bufref_set(&data->state.referer, data->set.str[STRING_SET_REFERER], + 0, NULL); ++ else ++ Curl_bufref_free(&data->state.referer); + + if(data->state.httpreq == HTTPREQ_PUT) + data->state.infilesize = data->set.filesize; +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index deb635e..7c3766c 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -218,7 +218,7 @@ test1620 test1621 test1622 test1623 test1624 \ + \ + test1630 test1631 test1632 test1633 test1634 test1635 test1636 test1637 \ + \ +-test1640 test1641 test1642 test1643 test1647 test1648 \ ++test1640 test1641 test1642 test1643 test1647 test1648 test1649 \ + \ + test1650 test1651 test1652 test1653 test1654 test1655 test1656 test1657 \ + test1658 \ +diff --git a/tests/data/test1649 b/tests/data/test1649 +new file mode 100644 +index 0000000..d2fd779 +--- /dev/null ++++ b/tests/data/test1649 +@@ -0,0 +1,55 @@ ++<?xml version="1.0" encoding="US-ASCII"?> ++<testcase> ++<info> ++<keywords> ++HTTP ++Referer ++</keywords> ++</info> ++ ++# Server-side ++<reply> ++ ++# this is returned first since we get no proxy-auth ++<data crlf="headers" nocheck="yes"> ++HTTP/1.1 200 OK ++Content-Length: 6 ++ ++hello ++</data> ++ ++</reply> ++ ++# Client-side ++<client> ++<server> ++http ++</server> ++ ++<tool> ++lib%TESTNUMBER ++</tool> ++<name> ++Set referer first then NULL it ++</name> ++<command> ++http://%HOSTIP:%HTTPPORT ++</command> ++</client> ++ ++# Verify data after the test has been "shot" ++<verify> ++<protocol crlf="headers"> ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Accept: */* ++Referer: https://secret.example.com/ ++ ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Accept: */* ++ ++</protocol> ++ ++</verify> ++</testcase> +diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc +index 655c32d..d7af26f 100644 +--- a/tests/libtest/Makefile.inc ++++ b/tests/libtest/Makefile.inc +@@ -100,7 +100,7 @@ TESTS_C = \ + lib1582.c lib1588.c \ + lib1591.c lib1592.c lib1593.c lib1594.c lib1597.c \ + lib1598.c lib1599.c \ +- lib1647.c lib1648.c \ ++ lib1647.c lib1648.c lib1649.c \ + lib1662.c \ + lib1900.c lib1901.c lib1902.c lib1903.c lib1905.c lib1906.c lib1907.c \ + lib1908.c lib1910.c lib1911.c lib1912.c lib1913.c \ +diff --git a/tests/libtest/lib1649.c b/tests/libtest/lib1649.c +new file mode 100644 +index 0000000..2dd66c0 +--- /dev/null ++++ b/tests/libtest/lib1649.c +@@ -0,0 +1,90 @@ ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Daniel Stenberg, <[email protected]>, 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 "first.h" ++ ++/* this is meant to pick up the proxy from the environment variable */ ++static CURLcode init1649(CURL *curl, const char *url) ++{ ++ CURLcode result = CURLE_OK; ++ ++ res_easy_setopt(curl, CURLOPT_URL, url); ++ if(result) ++ goto init_failed; ++ ++ res_easy_setopt(curl, CURLOPT_VERBOSE, 1L); ++ if(result) ++ goto init_failed; ++ ++ return CURLE_OK; /* success */ ++ ++init_failed: ++ return result; /* failure */ ++} ++ ++static CURLcode run1649(CURL *curl, const char *url) ++{ ++ CURLcode result = CURLE_OK; ++ ++ result = init1649(curl, url); ++ if(result) ++ return result; ++ ++ return curl_easy_perform(curl); ++} ++ ++static CURLcode test_lib1649(const char *URL) ++{ ++ CURLcode result = CURLE_OK; ++ CURL *curl = NULL; ++ ++ res_global_init(CURL_GLOBAL_ALL); ++ if(result) ++ return result; ++ ++ curl = curl_easy_init(); ++ if(!curl) { ++ curl_mfprintf(stderr, "curl_easy_init() failed\n"); ++ curl_global_cleanup(); ++ return TEST_ERR_MAJOR_BAD; ++ } ++ ++ start_test_timing(); ++ ++ easy_setopt(curl, CURLOPT_REFERER, "https://secret.example.com/";); ++ ++ result = run1649(curl, URL); ++ if(result) ++ goto test_cleanup; ++ ++ /* reset it */ ++ easy_setopt(curl, CURLOPT_REFERER, NULL); ++ ++ result = run1649(curl, URL); ++ ++test_cleanup: ++ curl_easy_cleanup(curl); ++ curl_global_cleanup(); ++ return result; ++} diff --git a/meta/recipes-support/curl/curl_8.19.0.bb b/meta/recipes-support/curl/curl_8.19.0.bb index f6ddc4aa230..fd0fbcea692 100644 --- a/meta/recipes-support/curl/curl_8.19.0.bb +++ b/meta/recipes-support/curl/curl_8.19.0.bb @@ -38,6 +38,8 @@ SRC_URI = " \ file://CVE-2026-13608.patch \ file://CVE-2026-18924.patch \ file://CVE-2026-80229.patch \ + file://CVE-2026-9546-01.patch \ + file://CVE-2026-9546-02.patch \ " SRC_URI:append:class-nativesdk = " \
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#246156): https://lists.openembedded.org/g/openembedded-core/message/246156 Mute This Topic: https://lists.openembedded.org/mt/121305643/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
