diff --git a/meta/recipes-support/curl/curl/CVE-2026-8926-dependent.patch b/meta/recipes-support/curl/curl/CVE-2026-8926-dependent.patch new file mode 100644 index 0000000000..1c46d08e27 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-8926-dependent.patch @@ -0,0 +1,140 @@ +From a327a5bdedfad6b486bca4e0a1a4fdac9ab298ca Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 9 Mar 2026 08:38:14 +0100 +Subject: [PATCH] netrc: refactor into smaller sub functions + +Fixes #20950 - test 685 is extended for this +Closes #20932 + +CVE: CVE-2026-8926 +Upstream-Status: Backport [https://github.com/curl/curl/commit/a327a5bdedfad6b486bca4e0a1a4fdac9ab298ca] + +Backport Changes: +- Kept the curl 8.19.0 parser and login/password API instead of + extracting netrc_state, token, state, and finalization helpers. +- Applied the password-presence check, generic-entry selection and + entry-state resets in the existing parser, without the helper moves. +- Omitted netrc_finalize's password-return comment because the CVE + fix must reject entries with an explicitly mismatched login. + +(cherry picked from commit a327a5bdedfad6b486bca4e0a1a4fdac9ab298ca) +Signed-off-by: Darsh Kelaiya +--- + docs/cmdline-opts/netrc.md | 12 ++++++++++-- + docs/libcurl/opts/CURLOPT_NETRC.md | 5 +++++ + lib/netrc.c | 17 ++++++++++++++--- + tests/data/test685 | 4 +++- + 4 files changed, 32 insertions(+), 6 deletions(-) + +diff --git a/docs/cmdline-opts/netrc.md b/docs/cmdline-opts/netrc.md +index 72b5ff9..03a7ed6 100644 +--- a/docs/cmdline-opts/netrc.md ++++ b/docs/cmdline-opts/netrc.md +@@ -35,10 +35,18 @@ On Windows two filenames in the home directory are checked: *.netrc* and + *_netrc*, preferring the former. Older versions on Windows checked for + *_netrc* only. + +-A quick and simple example of how to setup a *.netrc* to allow curl to FTP to +-the machine host.example.com with username 'myself' and password 'secret' ++A quick and simple example of how to setup a *.netrc* to allow curl to access ++the machine host.example.com with username `myself` and password `secret` + could look similar to: + + machine host.example.com + login myself + password secret ++ ++curl also supports the `default` keyword. This is the same as machine name ++except that default matches any name. There can be only one `default` token, ++and it must be after all machine tokens. ++ ++When providing a username in the URL and a *.netrc* file, curl looks for the ++password for that specific user for the given host if such an entry appears in ++the file before a "generic" `machine` entry without `login` specified. +diff --git a/docs/libcurl/opts/CURLOPT_NETRC.md b/docs/libcurl/opts/CURLOPT_NETRC.md +index 65d87cf..1e3dbb1 100644 +--- a/docs/libcurl/opts/CURLOPT_NETRC.md ++++ b/docs/libcurl/opts/CURLOPT_NETRC.md +@@ -50,6 +50,11 @@ and similar things are not supported). + The netrc file provides credentials for a hostname independent of which + protocol and port number that are used. + ++When providing a username in the URL and a *.netrc* file, libcurl looks for ++and uses the password for that specific user for the given host if such an ++entry appears in the file before a "generic" `machine` entry without `login` ++specified. ++ + libcurl does not verify that the file has the correct properties set (as the + standard Unix ftp client does). It should only be readable by user. + +diff --git a/lib/netrc.c b/lib/netrc.c +index 1073cc5..5eb0c84 100644 +--- a/lib/netrc.c ++++ b/lib/netrc.c +@@ -289,8 +289,7 @@ static NETRCcode parsenetrc(struct store_netrc *store, + retcode = NETRC_OUT_OF_MEMORY; /* allocation failed */ + goto out; + } +- if(!specific_login || our_login) +- found |= FOUND_PASSWORD; ++ found |= FOUND_PASSWORD; + keyword = NONE; + } + else if(curl_strequal("login", tok)) +@@ -299,13 +298,22 @@ static NETRCcode parsenetrc(struct store_netrc *store, + keyword = PASSWORD; + else if(curl_strequal("machine", tok)) { + /* a new machine here */ +- if(found & FOUND_PASSWORD) { ++ if(found & FOUND_PASSWORD && ++ /* a password was provided for this host */ ++ ++ ((!specific_login || our_login) || ++ /* either there was no specific login to search for, or this ++ is the specific one we wanted */ ++ (specific_login && !(found & FOUND_LOGIN)))) { ++ /* or we look for a specific login, but that was not specified */ ++ + done = TRUE; + break; + } + state = HOSTFOUND; + keyword = NONE; + found = 0; ++ our_login = FALSE; + Curl_safefree(password); + if(!specific_login) + Curl_safefree(login); +@@ -313,6 +321,9 @@ static NETRCcode parsenetrc(struct store_netrc *store, + else if(curl_strequal("default", tok)) { + state = HOSTVALID; + retcode = NETRC_OK; /* we did find our host */ ++ keyword = NONE; ++ found = 0; ++ our_login = FALSE; + Curl_safefree(password); + if(!specific_login) + Curl_safefree(login); +diff --git a/tests/data/test685 b/tests/data/test685 +index a069ff8..5346cd1 100644 +--- a/tests/data/test685 ++++ b/tests/data/test685 +@@ -26,13 +26,15 @@ Connection: close + http + + +-netrc with no login - provided user ++netrc with no login - but provided user in URL + + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/ + + ++machine %HOSTIP password firstthis login unknown + machine %HOSTIP password 5up3r53cr37 ++machine %HOSTIP password d1ff3r3nt login anotherone + + + +-- +2.35.6 diff --git a/meta/recipes-support/curl/curl/CVE-2026-8926_p1.patch b/meta/recipes-support/curl/curl/CVE-2026-8926_p1.patch new file mode 100644 index 0000000000..8402429fce --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-8926_p1.patch @@ -0,0 +1,100 @@ +From 4ae1d7cc2643e4773a136395f12bc02fc6867854 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Fri, 15 May 2026 11:45:49 +0200 +Subject: [PATCH] netrc: scanner refactor + +Refactor the netrc scanner. Add test case for checking that the last +matched machine with unmatched login does not return the password as +success (unit1304). + +Closes #21624 + +CVE: CVE-2026-8926 +Upstream-Status: Backport [https://github.com/curl/curl/commit/4ae1d7cc2643e4773a136395f12bc02fc6867854] + +Backport Changes: +- Kept the curl 8.19.0 tokenizer and login/password API in netrc.c; + omitted the Curl_creds API changes in netrc.h and url.c. +- Replaced the scanner refactor with a NETRC_NO_MATCH guard for an + unmatched requested login, keeping generic password-only entries. +- Corrected test 685's regression in the initial backport: a missing + login keyword must not reject a password-only entry for a URL user. +- Preserved the old blank-password behavior for a matching login. +- Adapted unit1304 to the curl 8.19.0 login/password API and retained + the upstream regression scenario for the last unmatched login. + +(cherry picked from commit 4ae1d7cc2643e4773a136395f12bc02fc6867854) +Signed-off-by: Darsh Kelaiya +--- + lib/netrc.c | 3 +++ + tests/unit/unit1304.c | 20 +++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/lib/netrc.c b/lib/netrc.c +index 5eb0c84..425a535 100644 +--- a/lib/netrc.c ++++ b/lib/netrc.c +@@ -349,6 +349,9 @@ static NETRCcode parsenetrc(struct store_netrc *store, + + out: + curlx_dyn_free(&token); ++ if(!retcode && specific_login && !our_login && ++ ((found & FOUND_LOGIN) || !password)) ++ retcode = NETRC_NO_MATCH; + if(!retcode) { + if(!password && our_login) { + /* success without a password, set a blank one */ +diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c +index 231ddd4..cff99f1 100644 +--- a/tests/unit/unit1304.c ++++ b/tests/unit/unit1304.c +@@ -59,7 +59,7 @@ static CURLcode test_unit1304(const char *arg) + login = curlx_strdup("me"); + Curl_netrc_init(&store); + result = Curl_parsenetrc(&store, "example.com", &login, &password, arg); +- fail_unless(result == 0, "Host should have been found"); ++ fail_unless(result == 1, "Login should not have been found"); + abort_unless(password == NULL, "password is not NULL!"); + Curl_netrc_cleanup(&store); + curlx_free(login); +@@ -82,7 +82,7 @@ static CURLcode test_unit1304(const char *arg) + login = curlx_strdup("admi"); /* spellchecker:disable-line */ + Curl_netrc_init(&store); + result = Curl_parsenetrc(&store, "example.com", &login, &password, arg); +- fail_unless(result == 0, "Host should have been found"); ++ fail_unless(result == 1, "Login should not have been found"); + abort_unless(password == NULL, "password is not NULL!"); + Curl_netrc_cleanup(&store); + curlx_free(login); +@@ -94,7 +94,7 @@ static CURLcode test_unit1304(const char *arg) + login = curlx_strdup("adminn"); + Curl_netrc_init(&store); + result = Curl_parsenetrc(&store, "example.com", &login, &password, arg); +- fail_unless(result == 0, "Host should have been found"); ++ fail_unless(result == 1, "Login should not have been found"); + abort_unless(password == NULL, "password is not NULL!"); + Curl_netrc_cleanup(&store); + curlx_free(login); +@@ -166,6 +166,20 @@ static CURLcode test_unit1304(const char *arg) + fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'"); + Curl_netrc_cleanup(&store); + ++ /* ++ * Test for the last host where we do not want to see the password ++ * if the login does not match. ++ */ ++ curlx_free(password); ++ password = NULL; ++ curlx_free(login); ++ login = curlx_strdup("hilarious"); ++ Curl_netrc_init(&store); ++ result = Curl_parsenetrc(&store, "curl.example.com", &login, &password, arg); ++ fail_unless(result == 1, "Login should not have been found"); ++ abort_unless(password == NULL, "password is not NULL!"); ++ Curl_netrc_cleanup(&store); ++ + UNITTEST_END(t1304_stop(&password, &login)) + } + +-- +2.35.6 diff --git a/meta/recipes-support/curl/curl/CVE-2026-8926_p2.patch b/meta/recipes-support/curl/curl/CVE-2026-8926_p2.patch new file mode 100644 index 0000000000..b511e03fc4 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2026-8926_p2.patch @@ -0,0 +1,84 @@ +From 7ca5f939c8403db7ede21e2ccb805a65d3329ef8 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Sat, 16 May 2026 00:54:13 +0200 +Subject: [PATCH] test1646: netrc parsing without user match but user in URL + +Follow-up to 4ae1d7cc2643e + +CVE: CVE-2026-8926 +Upstream-Status: Backport [https://github.com/curl/curl/commit/7ca5f939c8403db7ede21e2ccb805a65d3329ef8] + +Backport Changes: +- Registered test 1646 in the older curl 8.19.0 test-list row. + +(cherry picked from commit 7ca5f939c8403db7ede21e2ccb805a65d3329ef8) +Signed-off-by: Darsh Kelaiya +--- + tests/data/Makefile.am | 2 +- + tests/data/test1646 | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 1 deletion(-) + +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index 13e47a3..ea700cd 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 test1649 \ ++test1640 test1641 test1642 test1643 test1646 test1647 test1648 test1649 \ + \ + test1650 test1651 test1652 test1653 test1654 test1655 test1656 test1657 \ + test1658 \ +diff --git a/tests/data/test1646 b/tests/data/test1646 +new file mode 100644 +index 0000000..3df03be +--- /dev/null ++++ b/tests/data/test1646 +@@ -0,0 +1,45 @@ ++ ++ ++ ++ ++netrc ++ ++ ++ ++ ++ ++HTTP/1.1 200 OK ++Content-Length: 6 ++ ++12345 ++ ++ ++ ++# Client-side ++ ++ ++http ++ ++ ++netrc parsing without user match but user in URL ++ ++ ++--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER http://alice@example.com:%HTTPPORT/%TESTNUMBER --resolve example.com:%HTTPPORT:%HOSTIP ++ ++ ++machine example.com login bob password sekret ++ ++ ++ ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: example.com:%HTTPPORT ++Authorization: Basic %b64[alice:]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++ diff --git a/meta/recipes-support/curl/curl_8.19.0.bb b/meta/recipes-support/curl/curl_8.19.0.bb index c2697d6dd8..af76f5d53b 100644 --- a/meta/recipes-support/curl/curl_8.19.0.bb +++ b/meta/recipes-support/curl/curl_8.19.0.bb @@ -38,6 +38,9 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2026-80229.patch \ file://CVE-2026-9546-01.patch \ file://CVE-2026-9546-02.patch \ + file://CVE-2026-8926-dependent.patch \ + file://CVE-2026-8926_p1.patch \ + file://CVE-2026-8926_p2.patch \ file://CVE-2026-80230.patch \ "