* [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469
@ 2026-07-22 10:12 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 2/4] wget: Fix CVE-2026-58470 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 UTC (permalink / raw)
To: openembedded-core; +Cc: xe-linux-external, Hetvi Thakar
From: Hetvi Thakar <hthakar@cisco.com>
This patch applies the upstream fix as referenced in [2],
using the commit shown in [1].
It also includes the upstream follow-up fixes referenced in [3]
and [4]. These correct the trailing whitespace check introduced
by the original fix and add the required <ctype.h> include for
isspace().
[1] https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826
[2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469
[3] https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf
[4] https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1
Signed-off-by: Hetvi Thakar <hthakar@cisco.com>
---
Changes in v2
- Included upstream follow-up commit to correct the
trailing whitespace check.
- Included upstream follow-up commit to add the
required <ctype.h> include for isspace().
---
.../wget/CVE-2026-58469-regression_p1.patch | 39 ++++++++++++++
.../wget/CVE-2026-58469-regression_p2.patch | 26 +++++++++
.../wget/wget/CVE-2026-58469.patch | 53 +++++++++++++++++++
meta/recipes-extended/wget/wget_1.21.4.bb | 3 ++
4 files changed, 121 insertions(+)
create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p1.patch
create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p2.patch
create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58469.patch
diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p1.patch b/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p1.patch
new file mode 100644
index 0000000000..0f8e93c2d3
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p1.patch
@@ -0,0 +1,39 @@
+From be4edfe6d30a9db8e51215f0232d31eb92d502ec Mon Sep 17 00:00:00 2001
+From: ChenYanpan <chenyanpan@xfusion.com>
+Date: Wed, 8 Jul 2026 12:09:55 +0800
+Subject: [PATCH] * src/metalink.c (clean_metalink_string): Fix inverted
+ trailing-space check
+
+37a40fcb added an `end > beg' bound guard to prevent a buffer
+underflow, but accidentally flipped the condition from `isspace' to
+`!isspace'. The loop therefore walked back over non-space characters
+instead of trailing whitespace, collapsing any string without a
+trailing newline to "". Every Metalink/HTTP resource URL was wiped,
+so wget could not follow any mirror and
+testenv/Test-metalink-http.py failed ("Expected file test.meta not
+found"). Restore the `isspace' condition.
+
+Copyright-paperwork-exempt: Yes
+
+CVE: CVE-2026-58469
+Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf]
+
+(cherry picked from commit 7b1cdecc49bc77bde220fc575c8a00386c3f3bcf)
+Signed-off-by: Hetvi Thakar <hthakar@cisco.com>
+---
+ src/metalink.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/metalink.c b/src/metalink.c
+index 10d58cf7..9f969a60 100644
+--- a/src/metalink.c
++++ b/src/metalink.c
+@@ -1061,7 +1061,7 @@ clean_metalink_string (char **str)
+ /* If we are at the end of the string, search the first legit
+ character going backward. */
+ if (*end == '\0')
+- while (end > beg && !isspace(*(end - 1)))
++ while (end > beg && isspace(*(end - 1)))
+ end--;
+
+ new = xmemdup0 (beg, end - beg);
diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p2.patch b/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p2.patch
new file mode 100644
index 0000000000..940d63e00c
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2026-58469-regression_p2.patch
@@ -0,0 +1,26 @@
+From aa412523158313619dd04d49b6f769d639e7dcc5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Thu, 9 Jul 2026 14:50:40 +0200
+Subject: [PATCH] * src/metalink.c: Include ctype.h
+
+CVE: CVE-2026-58469
+Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1]
+
+(cherry picked from commit 82d945ff5dc9942b78b2bf736aac298c24fe00a1)
+Signed-off-by: Hetvi Thakar <hthakar@cisco.com>
+---
+ src/metalink.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/metalink.c b/src/metalink.c
+index 9f969a60..16933be4 100644
+--- a/src/metalink.c
++++ b/src/metalink.c
+@@ -46,6 +46,7 @@ as that of the covered work. */
+ #include "c-strcase.h"
+ #include <errno.h>
+ #include <unistd.h> /* For unlink. */
++#include <ctype.h>
+ #include <metalink/metalink_parser.h>
+ #ifdef HAVE_GPGME
+ #include <gpgme.h>
diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58469.patch b/meta/recipes-extended/wget/wget/CVE-2026-58469.patch
new file mode 100644
index 0000000000..96bcb62df7
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2026-58469.patch
@@ -0,0 +1,53 @@
+From 2442499cc090e6aa804b0295fe9f881b78df2940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Mon, 29 Jun 2026 18:32:02 +0200
+Subject: [PATCH] * src/metalink.c (clean_metalink_string): Fix buffer
+ underflow
+
+Reported-by: TristanInSec@gmail.com
+
+CVE: CVE-2026-58469
+Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826]
+
+(cherry picked from commit 37a40fcb450153f69537c7cbc2a7a4fb0b6f7826)
+Signed-off-by: Hetvi Thakar <hthakar@cisco.com>
+---
+ src/metalink.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/metalink.c b/src/metalink.c
+index eca839c2..10d58cf7 100644
+--- a/src/metalink.c
++++ b/src/metalink.c
+@@ -1041,7 +1041,6 @@ void
+ clean_metalink_string (char **str)
+ {
+ int c;
+- size_t len;
+ char *new, *beg, *end;
+
+ if (!str || !*str)
+@@ -1049,7 +1048,7 @@ clean_metalink_string (char **str)
+
+ beg = *str;
+
+- while ((c = *beg) && (c == '\n' || c == '\r' || c == '\t' || c == ' '))
++ while (isspace(*beg))
+ beg++;
+
+ end = beg;
+@@ -1062,12 +1061,10 @@ clean_metalink_string (char **str)
+ /* If we are at the end of the string, search the first legit
+ character going backward. */
+ if (*end == '\0')
+- while ((c = *(end - 1)) && (c == '\n' || c == '\r' || c == '\t' || c == ' '))
++ while (end > beg && !isspace(*(end - 1)))
+ end--;
+
+- len = end - beg;
+-
+- new = xmemdup0 (beg, len);
++ new = xmemdup0 (beg, end - beg);
+ xfree (*str);
+ *str = new;
+ }
diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.21.4.bb
index b5f50f6c84..cb05ff34f8 100644
--- a/meta/recipes-extended/wget/wget_1.21.4.bb
+++ b/meta/recipes-extended/wget/wget_1.21.4.bb
@@ -2,6 +2,9 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
file://0002-improve-reproducibility.patch \
file://CVE-2024-38428.patch \
file://CVE-2024-10524.patch \
+ file://CVE-2026-58469.patch \
+ file://CVE-2026-58469-regression_p1.patch \
+ file://CVE-2026-58469-regression_p2.patch \
"
SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c"
--
2.35.6
^ permalink raw reply related [flat|nested] 11+ messages in thread* [OE-core][scarthgap][PATCH 2/4] wget: Fix CVE-2026-58470 2026-07-22 10:12 [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 3/4] wget: Fix CVE-2026-58471 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) ` (2 subsequent siblings) 3 siblings, 0 replies; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 UTC (permalink / raw) To: openembedded-core; +Cc: xe-linux-external, Hetvi Thakar From: Hetvi Thakar <hthakar@cisco.com> This patch applies the upstream fix as referenced in [2], using the commit shown in [1]. [1] https://gitlab.com/gnuwget/wget/-/commit/43d3ba9336bc94937e6fae2365c6ffd30c34ffcf [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58470 Signed-off-by: Hetvi Thakar <hthakar@cisco.com> --- .../wget/wget/CVE-2026-58470.patch | 79 +++++++++++++++++++ meta/recipes-extended/wget/wget_1.21.4.bb | 1 + 2 files changed, 80 insertions(+) create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58470.patch diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58470.patch b/meta/recipes-extended/wget/wget/CVE-2026-58470.patch new file mode 100644 index 0000000000..7ee4e87344 --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2026-58470.patch @@ -0,0 +1,79 @@ +From bfbab29e0a94160b283a8101e122d07684104955 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Mon, 29 Jun 2026 18:57:54 +0200 +Subject: [PATCH] * src/http.c (parse_content_range): Fix integer overflow + +Reported-by: TristanInSec@gmail.com + +CVE: CVE-2026-58470 +Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/43d3ba9336bc94937e6fae2365c6ffd30c34ffcf] + +(cherry picked from commit 43d3ba9336bc94937e6fae2365c6ffd30c34ffcf) +Signed-off-by: Hetvi Thakar <hthakar@cisco.com> +--- + src/http.c | 35 ++++++++++++++++++++++++----------- + 1 file changed, 24 insertions(+), 11 deletions(-) + +diff --git a/src/http.c b/src/http.c +index 116a93a3..4dc6b70f 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -914,6 +914,7 @@ parse_content_range (const char *hdr, wgint *first_byte_ptr, + wgint *last_byte_ptr, wgint *entity_length_ptr) + { + wgint num; ++ char *end; + + /* Ancient versions of Netscape proxy server, presumably predating + rfc2068, sent out `Content-Range' without the "bytes" +@@ -932,27 +933,39 @@ parse_content_range (const char *hdr, wgint *first_byte_ptr, + } + if (!c_isdigit (*hdr)) + return false; +- for (num = 0; c_isdigit (*hdr); hdr++) +- num = 10 * num + (*hdr - '0'); +- if (*hdr != '-' || !c_isdigit (*(hdr + 1))) ++ ++ errno = 0; ++ num = strtol(hdr, &end, 10); ++ if (errno == ERANGE) ++ return false; ++ hdr = end; ++ ++ if (*hdr++ != '-' || !c_isdigit (*hdr)) + return false; + *first_byte_ptr = num; +- ++hdr; +- for (num = 0; c_isdigit (*hdr); hdr++) +- num = 10 * num + (*hdr - '0'); +- if (*hdr != '/') ++ ++ errno = 0; ++ num = strtol(hdr, &end, 10); ++ if (errno == ERANGE) ++ return false; ++ hdr = end; ++ ++ if (*hdr++ != '/') + return false; + *last_byte_ptr = num; +- if (!(c_isdigit (*(hdr + 1)) || *(hdr + 1) == '*')) ++ if (!(c_isdigit (*hdr) || *hdr == '*')) + return false; + if (*last_byte_ptr < *first_byte_ptr) + return false; +- ++hdr; + if (*hdr == '*') + num = -1; + else +- for (num = 0; c_isdigit (*hdr); hdr++) +- num = 10 * num + (*hdr - '0'); ++ { ++ errno = 0; ++ num = strtol(hdr, NULL, 10); ++ if (errno == ERANGE) ++ return false; ++ } + *entity_length_ptr = num; + if ((*entity_length_ptr <= *last_byte_ptr) && *entity_length_ptr != -1) + return false; diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.21.4.bb index cb05ff34f8..50df38aab1 100644 --- a/meta/recipes-extended/wget/wget_1.21.4.bb +++ b/meta/recipes-extended/wget/wget_1.21.4.bb @@ -5,6 +5,7 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://CVE-2026-58469.patch \ file://CVE-2026-58469-regression_p1.patch \ file://CVE-2026-58469-regression_p2.patch \ + file://CVE-2026-58470.patch \ " SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" -- 2.35.6 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [OE-core][scarthgap][PATCH 3/4] wget: Fix CVE-2026-58471 2026-07-22 10:12 [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 2/4] wget: Fix CVE-2026-58470 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 4/4] wget: Fix CVE-2026-58472 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 17:43 ` [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Yoann Congal 3 siblings, 0 replies; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 UTC (permalink / raw) To: openembedded-core; +Cc: xe-linux-external, Hetvi Thakar From: Hetvi Thakar <hthakar@cisco.com> This patch applies the upstream fix as referenced in [2], using the commit shown in [1]. [1] https://gitlab.com/gnuwget/wget/-/commit/c2640fe5171c59f87c58dc9fcb195b2d18b010ee [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58471 Signed-off-by: Hetvi Thakar <hthakar@cisco.com> --- .../wget/wget/CVE-2026-58471.patch | 71 +++++++++++++++++++ meta/recipes-extended/wget/wget_1.21.4.bb | 1 + 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58471.patch diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58471.patch b/meta/recipes-extended/wget/wget/CVE-2026-58471.patch new file mode 100644 index 0000000000..4938e6761a --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2026-58471.patch @@ -0,0 +1,71 @@ +From f419222cc7e02dea2da104b4fb5a997019bab9a9 Mon Sep 17 00:00:00 2001 +From: Arkadi Vainbrand <arkadva8@gmail.com> +Date: Tue, 13 Jan 2026 12:22:04 +0200 +Subject: [PATCH] Fix buffer size handling in filename conversion + +* src/url.c (convert_fname): Fix buffer overflow. + +Copyright-paperwork-exempt: Yes + +CVE: CVE-2026-58471 +Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/c2640fe5171c59f87c58dc9fcb195b2d18b010ee] + +Signed-off-by: Arkadi Vainbrand <arkadva8@gmail.com> +(cherry picked from commit c2640fe5171c59f87c58dc9fcb195b2d18b010ee) +Signed-off-by: Hetvi Thakar <hthakar@cisco.com> +--- + src/url.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/url.c b/src/url.c +index 68688256..6a9efe88 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -1603,7 +1603,7 @@ convert_fname (char *fname) + const char *from_encoding = opt.encoding_remote; + const char *to_encoding = opt.locale; + iconv_t cd; +- size_t len, done, inlen, outlen; ++ size_t len, inlen, outlen; + char *s; + const char *orig_fname; + +@@ -1625,7 +1625,6 @@ convert_fname (char *fname) + inlen = strlen (fname); + len = outlen = inlen * 2; + converted_fname = s = xmalloc (outlen + 1); +- done = 0; + + for (;;) + { +@@ -1633,7 +1632,7 @@ convert_fname (char *fname) + if (iconv (cd, (ICONV_CONST char **) &fname, &inlen, &s, &outlen) == 0 + && iconv (cd, NULL, NULL, &s, &outlen) == 0) + { +- *(converted_fname + len - outlen - done) = '\0'; ++ *s = '\0'; + iconv_close (cd); + DEBUGP (("Converted file name '%s' (%s) -> '%s' (%s)\n", + orig_fname, from_encoding, converted_fname, to_encoding)); +@@ -1656,10 +1655,17 @@ convert_fname (char *fname) + } + else if (errno == E2BIG) /* Output buffer full */ + { +- done = len; +- len = outlen = done + inlen * 2; +- converted_fname = xrealloc (converted_fname, outlen + 1); +- s = converted_fname + done; ++ size_t used = s - converted_fname; ++ size_t newlen = used + inlen * 2 + 1; ++ ++ /* Ensure we actually grow the buffer */ ++ if (newlen <= len) ++ newlen = len * 2; ++ ++ converted_fname = xrealloc (converted_fname, newlen + 1); ++ len = newlen; ++ s = converted_fname + used; ++ outlen = len - used; + } + else /* Weird, we got an unspecified error */ + { diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.21.4.bb index 50df38aab1..fa4958a485 100644 --- a/meta/recipes-extended/wget/wget_1.21.4.bb +++ b/meta/recipes-extended/wget/wget_1.21.4.bb @@ -6,6 +6,7 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://CVE-2026-58469-regression_p1.patch \ file://CVE-2026-58469-regression_p2.patch \ file://CVE-2026-58470.patch \ + file://CVE-2026-58471.patch \ " SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" -- 2.35.6 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [OE-core][scarthgap][PATCH 4/4] wget: Fix CVE-2026-58472 2026-07-22 10:12 [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 2/4] wget: Fix CVE-2026-58470 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 3/4] wget: Fix CVE-2026-58471 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-07-22 17:43 ` [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Yoann Congal 3 siblings, 0 replies; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 10:12 UTC (permalink / raw) To: openembedded-core; +Cc: xe-linux-external, Hetvi Thakar From: Hetvi Thakar <hthakar@cisco.com> Apply the upstream fix referenced in [2] using the commit listed in [1]. Also include the upstream follow-up commit [3], which fixes encoded entity length handling and adds regression tests. [1] https://gitlab.com/gnuwget/wget/-/commit/dd692d9cea5335b181d877ae917fe6e75587a812 [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58472 [3] https://gitlab.com/gnuwget/wget/-/commit/f76978a51ba9365e7ecaed96c1cfb73197a38ca2 Signed-off-by: Hetvi Thakar <hthakar@cisco.com> --- .../wget/wget/CVE-2026-58472-regression.patch | 236 ++++++++++++++++++ .../wget/wget/CVE-2026-58472.patch | 77 ++++++ meta/recipes-extended/wget/wget_1.21.4.bb | 2 + 3 files changed, 315 insertions(+) create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58472-regression.patch create mode 100644 meta/recipes-extended/wget/wget/CVE-2026-58472.patch diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58472-regression.patch b/meta/recipes-extended/wget/wget/CVE-2026-58472-regression.patch new file mode 100644 index 0000000000..c82d2f2b06 --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2026-58472-regression.patch @@ -0,0 +1,236 @@ +From 6ab6b6d2fc2ed5e4cbb4908b9ad282110f30a688 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Thu, 2 Jul 2026 13:13:07 +0200 +Subject: [PATCH] Regression: Fix buffer overflow in html_quote_string() + +The regression has been introduced in commit dd692d9 and +is not part of any release. + +The tests allow the address sanitizer to find the issue. + +* src/convert.c: Fix string size calculation. +* tests/unit-tests.c: Added tests including tests for html_quote_string(). +* tests/unit-tests.h: Add definitions for the test functions. + +Reported-by: Trung Nguyen <trungnh@cystack.net> + +CVE: CVE-2026-58472 +Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/f76978a51ba9365e7ecaed96c1cfb73197a38ca2] + +(cherry picked from commit f76978a51ba9365e7ecaed96c1cfb73197a38ca2) +Signed-off-by: Hetvi Thakar <hthakar@cisco.com> +--- + src/convert.c | 148 +++++++++++++++++++++++++++++++++++++++++++-- + tests/unit-tests.c | 4 ++ + tests/unit-tests.h | 4 ++ + 3 files changed, 152 insertions(+), 4 deletions(-) + +diff --git a/src/convert.c b/src/convert.c +index 51636340..4dae497c 100644 +--- a/src/convert.c ++++ b/src/convert.c +@@ -48,6 +48,9 @@ as that of the covered work. */ + #include "css-url.h" + #include "iri.h" + #include "xstrndup.h" ++#ifdef TESTING ++#include "../tests/unit-tests.h" ++#endif + + static struct hash_table *dl_file_url_map; + struct hash_table *dl_url_file_map; +@@ -1177,13 +1180,13 @@ html_quote_string (const char *s) + for (i = 0; *s; s++) + { + if (*s == '&') +- ok = INT_ADD_OK (i, 4, &i); /* `amp;' */ ++ ok = INT_ADD_OK (i, 4 + 1, &i); /* `amp;' */ + else if (*s == '<' || *s == '>') +- ok = INT_ADD_OK (i, 3, &i); /* `lt;' and `gt;' */ ++ ok = INT_ADD_OK (i, 3 + 1, &i); /* `lt;' and `gt;' */ + else if (*s == '\"') +- ok = INT_ADD_OK (i, 5, &i); /* `quot;' */ ++ ok = INT_ADD_OK (i, 5 + 1, &i); /* `quot;' */ + else if (*s == ' ') +- ok = INT_ADD_OK (i, 4, &i); /* #32; */ ++ ok = INT_ADD_OK (i, 4 + 1, &i); /* #32; */ + else + ok = INT_ADD_OK (i, 1, &i); + +@@ -1242,6 +1245,143 @@ html_quote_string (const char *s) + return res; + } + ++#ifdef TESTING ++ ++const char * ++test_construct_relative (void) ++{ ++ static const struct { ++ const char *basefile; ++ const char *linkfile; ++ const char *expected; ++ } test_array[] = { ++ { "foo", "bar", "bar" }, ++ { "A/foo", "A/bar", "bar" }, ++ { "A/foo", "A/B/bar", "B/bar" }, ++ { "A/X/foo", "A/Y/bar", "../Y/bar" }, ++ { "X/", "Y/bar", "../Y/bar" }, ++ { "/foo", "/bar", "bar" }, ++ { "/a/b/c", "/a/b/d", "d" }, ++ { "/a/b/c", "/a/b/c/d", "c/d" }, ++ { "/a/b/c", "/a/b/c/d/e", "c/d/e" }, ++ { "/a/b/c", "/x/y/z", "../../x/y/z" }, ++ { "a/b", "c/d", "../c/d" }, ++ { "./foo", "./bar", "bar" }, ++ }; ++ ++ for (unsigned i = 0; i < countof (test_array); ++i) ++ { ++ char *result = construct_relative (test_array[i].basefile, ++ test_array[i].linkfile); ++ mu_assert ("test_construct_relative: wrong result", ++ strcmp (result, test_array[i].expected) == 0); ++ xfree (result); ++ } ++ ++ return NULL; ++} ++ ++const char * ++test_match_except_index (void) ++{ ++ static const struct { ++ const char *s1; ++ const char *s2; ++ bool expected; ++ } test_array[] = { ++ { "foo/index.html", "foo/", true }, ++ { "foo/", "foo/index.html", true }, ++ { "foo", "foo/index.html", true }, ++ { "foo", "foo/", true }, ++ { "foo", "foo", true }, ++ { "/foo/index.html", "/foo/", true }, ++ { "/foo/", "/foo/index.html", true }, ++ { "/foo", "/foo/index.html", true }, ++ { "/foo", "/foo/", true }, ++ { "foo/bar", "foo/qux", false }, ++ { "foo/bar", "bar/foo", false }, ++ }; ++ ++ for (unsigned i = 0; i < countof (test_array); ++i) ++ { ++ bool result = match_except_index (test_array[i].s1, test_array[i].s2); ++ mu_assert ("test_match_except_index: wrong result", ++ result == test_array[i].expected); ++ } ++ ++ return NULL; ++} ++ ++const char * ++test_find_fragment (void) ++{ ++ static const struct { ++ const char *input; ++ int size; ++ bool has_fragment; ++ const char *fragment; ++ } test_array[] = { ++ { "http://example.com#section", 26, true, "#section" }, ++ { "http://example.com", 18, false, NULL }, ++ { "http://example.com?a=1#frag", 24, true, "#frag" }, ++ { "http://example.com?a=1%26#frag", 28, true, "#frag" }, ++ { "http://example.com?a=1&b=2#frag", 30, true, "#frag" }, ++ { "a#b", 3, true, "#b" }, ++ { "a", 1, false, NULL }, ++ }; ++ const char *bp, *ep; ++ ++ for (unsigned i = 0; i < countof (test_array); ++i) ++ { ++ bool result = find_fragment (test_array[i].input, ++ test_array[i].size, &bp, &ep); ++ mu_assert ("test_find_fragment: wrong result", ++ result == test_array[i].has_fragment); ++ if (test_array[i].has_fragment) ++ { ++ mu_assert ("test_find_fragment: wrong fragment", bp != NULL); ++ mu_assert ("test_find_fragment: fragment mismatch", ++ strncmp (bp, test_array[i].fragment, ++ strlen (test_array[i].fragment)) == 0 && ++ ep == test_array[i].input + test_array[i].size); ++ } ++ } ++ ++ return NULL; ++} ++ ++const char * ++test_html_quote_string (void) ++{ ++ static const struct { ++ const char *input; ++ const char *expected; ++ } test_array[] = { ++ { "hello", "hello" }, ++ { "a&b", "a&b" }, ++ { "<tag>", "<tag>" }, ++ { "\"quote\"", ""quote"" }, ++ { "space here", "space here" }, ++ { "&<>\" ", "&<>" " }, ++ { "no special", "no special" }, ++ { "&&&&", "&&&&" }, ++ { "<<>>", "<<>>" }, ++ { "" , "" }, ++ }; ++ ++ for (unsigned i = 0; i < countof (test_array); ++i) ++ { ++ char *result = html_quote_string (test_array[i].input); ++ mu_assert ("test_html_quote_string: wrong result", ++ strcmp (result, test_array[i].expected) == 0); ++ xfree (result); ++ } ++ ++ return NULL; ++} ++ ++#endif /* TESTING */ ++ + /* + * vim: et ts=2 sw=2 + */ +diff --git a/tests/unit-tests.c b/tests/unit-tests.c +index 085a0321..f92d72b4 100644 +--- a/tests/unit-tests.c ++++ b/tests/unit-tests.c +@@ -66,6 +66,10 @@ all_tests(void) + mu_run_test (test_hsts_read_database); + #endif + mu_run_test (test_parse_netrc); ++ mu_run_test (test_construct_relative); ++ mu_run_test (test_match_except_index); ++ mu_run_test (test_find_fragment); ++ mu_run_test (test_html_quote_string); + + return NULL; + } +diff --git a/tests/unit-tests.h b/tests/unit-tests.h +index 16573b1c..7542660b 100644 +--- a/tests/unit-tests.h ++++ b/tests/unit-tests.h +@@ -62,6 +62,10 @@ const char *test_hsts_url_rewrite_superdomain(void); + const char *test_hsts_url_rewrite_congruent(void); + const char *test_hsts_read_database(void); + const char *test_parse_netrc(void); ++const char *test_construct_relative(void); ++const char *test_match_except_index(void); ++const char *test_find_fragment(void); ++const char *test_html_quote_string(void); + + #endif /* TEST_H */ + +-- +2.35.6 + diff --git a/meta/recipes-extended/wget/wget/CVE-2026-58472.patch b/meta/recipes-extended/wget/wget/CVE-2026-58472.patch new file mode 100644 index 0000000000..29f6f23d07 --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2026-58472.patch @@ -0,0 +1,77 @@ +From 7d0400b63382fbf336df9b63c787571d2df8a772 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Mon, 29 Jun 2026 19:13:15 +0200 +Subject: [PATCH] * src/convert.c (html_quote_string): Fix integer+buffer + overflow + +Reported-by: TristanInSec@gmail.com + +CVE: CVE-2026-58472 +Upstream-Status: Backport [https://gitlab.com/gnuwget/wget/-/commit/dd692d9cea5335b181d877ae917fe6e75587a812] + +(cherry picked from commit dd692d9cea5335b181d877ae917fe6e75587a812) +Signed-off-by: Hetvi Thakar <hthakar@cisco.com> +--- + src/convert.c | 31 ++++++++++++++++++++++++------- + 1 file changed, 24 insertions(+), 7 deletions(-) + +diff --git a/src/convert.c b/src/convert.c +index b934d49b..51636340 100644 +--- a/src/convert.c ++++ b/src/convert.c +@@ -36,6 +36,7 @@ as that of the covered work. */ + #include <unistd.h> + #include <errno.h> + #include <assert.h> ++#include <intprops.h> + #include "convert.h" + #include "url.h" + #include "recur.h" +@@ -1169,21 +1170,37 @@ html_quote_string (const char *s) + { + const char *b = s; + char *p, *res; +- int i; ++ size_t i; ++ int ok; + + /* Pass through the string, and count the new size. */ +- for (i = 0; *s; s++, i++) ++ for (i = 0; *s; s++) + { + if (*s == '&') +- i += 4; /* `amp;' */ ++ ok = INT_ADD_OK (i, 4, &i); /* `amp;' */ + else if (*s == '<' || *s == '>') +- i += 3; /* `lt;' and `gt;' */ ++ ok = INT_ADD_OK (i, 3, &i); /* `lt;' and `gt;' */ + else if (*s == '\"') +- i += 5; /* `quot;' */ ++ ok = INT_ADD_OK (i, 5, &i); /* `quot;' */ + else if (*s == ' ') +- i += 4; /* #32; */ ++ ok = INT_ADD_OK (i, 4, &i); /* #32; */ ++ else ++ ok = INT_ADD_OK (i, 1, &i); ++ ++ if (!ok) ++ { ++ DEBUGP (("Overflow detected in html_quote_string().\n")); ++ abort(); ++ } + } +- res = xmalloc (i + 1); ++ ++ if (!INT_ADD_OK (i, 1, &i)) ++ { ++ DEBUGP (("Overflow detected in html_quote_string().\n")); ++ abort(); ++ } ++ ++ res = xmalloc (i); + s = b; + for (p = res; *s; s++) + { +-- +2.35.6 + diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.21.4.bb index fa4958a485..be3b750880 100644 --- a/meta/recipes-extended/wget/wget_1.21.4.bb +++ b/meta/recipes-extended/wget/wget_1.21.4.bb @@ -7,6 +7,8 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://CVE-2026-58469-regression_p2.patch \ file://CVE-2026-58470.patch \ file://CVE-2026-58471.patch \ + file://CVE-2026-58472.patch \ + file://CVE-2026-58472-regression.patch \ " SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" -- 2.35.6 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-07-22 10:12 [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) ` (2 preceding siblings ...) 2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 4/4] wget: Fix CVE-2026-58472 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-22 17:43 ` Yoann Congal 2026-07-23 8:45 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) [not found] ` <18C4DECEC4DDFC1A.1355869@lists.openembedded.org> 3 siblings, 2 replies; 11+ messages in thread From: Yoann Congal @ 2026-07-22 17:43 UTC (permalink / raw) To: hthakar, openembedded-core; +Cc: xe-linux-external On Wed Jul 22, 2026 at 12:12 PM CEST, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > From: Hetvi Thakar <hthakar@cisco.com> > > This patch applies the upstream fix as referenced in [2], > using the commit shown in [1]. > > It also includes the upstream follow-up fixes referenced in [3] > and [4]. These correct the trailing whitespace check introduced > by the original fix and add the required <ctype.h> include for > isspace(). > > [1] https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 > [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469 > [3] https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf > [4] https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 > > Signed-off-by: Hetvi Thakar <hthakar@cisco.com> Hello, I received another similar series 2 hours before yours: https://patchwork.yoctoproject.org/project/oe-core/list/?series=48993 Can you help review it? Regards, -- Yoann Congal Smile ECS ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-07-22 17:43 ` [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Yoann Congal @ 2026-07-23 8:45 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) [not found] ` <18C4DECEC4DDFC1A.1355869@lists.openembedded.org> 1 sibling, 0 replies; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-07-23 8:45 UTC (permalink / raw) To: Yoann Congal, openembedded-core@lists.openembedded.org Cc: xe-linux-external (Internal Group) [-- Attachment #1: Type: text/plain, Size: 1853 bytes --] Hi, I reviewed the earlier series. It looks like the follow-up upstream regression fixes for CVE-2026-58469 and CVE-2026-58472 were not included in the backport. These follow-up commits are required to complete the backport, and I have included them in my series . I kindly request you to review my series as well. Thanks, Hetvi Thakar ________________________________ From: Yoann Congal <yoann.congal@smile.fr> Sent: 22 July 2026 23:13 To: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) <hthakar@cisco.com>; openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> Cc: xe-linux-external (Internal Group) <xe-linux-external@cisco.com> Subject: Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 On Wed Jul 22, 2026 at 12:12 PM CEST, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > From: Hetvi Thakar <hthakar@cisco.com> > > This patch applies the upstream fix as referenced in [2], > using the commit shown in [1]. > > It also includes the upstream follow-up fixes referenced in [3] > and [4]. These correct the trailing whitespace check introduced > by the original fix and add the required <ctype.h> include for > isspace(). > > [1] https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 > [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469 > [3] https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf > [4] https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 > > Signed-off-by: Hetvi Thakar <hthakar@cisco.com> Hello, I received another similar series 2 hours before yours: https://patchwork.yoctoproject.org/project/oe-core/list/?series=48993 Can you help review it? Regards, -- Yoann Congal Smile ECS [-- Attachment #2: Type: text/html, Size: 5031 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <18C4DECEC4DDFC1A.1355869@lists.openembedded.org>]
* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 [not found] ` <18C4DECEC4DDFC1A.1355869@lists.openembedded.org> @ 2026-08-20 9:09 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-08-25 11:31 ` Yoann Congal 0 siblings, 1 reply; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-20 9:09 UTC (permalink / raw) To: Yoann Congal, openembedded-core@lists.openembedded.org, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) Cc: xe-linux-external (Internal Group) [-- Attachment #1: Type: text/plain, Size: 2687 bytes --] Hi Yoann, I hope you're doing well. I wanted to follow up on the patch below. It appears it may have been missed during the review process. Could you please take a look when you have a chance and share your feedback? Thank you for your time. Regards, Hetvi ________________________________ From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> on behalf of Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org <hthakar=cisco.com@lists.openembedded.org> Sent: 23 July 2026 14:15 To: Yoann Congal <yoann.congal@smile.fr>; openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> Cc: xe-linux-external (Internal Group) <xe-linux-external@cisco.com> Subject: Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hi, I reviewed the earlier series. It looks like the follow-up upstream regression fixes for CVE-2026-58469 and CVE-2026-58472 were not included in the backport. These follow-up commits are required to complete the backport, and I have included them in my series . I kindly request you to review my series as well. Thanks, Hetvi Thakar ________________________________ From: Yoann Congal <yoann.congal@smile.fr> Sent: 22 July 2026 23:13 To: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) <hthakar@cisco.com>; openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> Cc: xe-linux-external (Internal Group) <xe-linux-external@cisco.com> Subject: Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 On Wed Jul 22, 2026 at 12:12 PM CEST, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > From: Hetvi Thakar <hthakar@cisco.com> > > This patch applies the upstream fix as referenced in [2], > using the commit shown in [1]. > > It also includes the upstream follow-up fixes referenced in [3] > and [4]. These correct the trailing whitespace check introduced > by the original fix and add the required <ctype.h> include for > isspace(). > > [1] https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 > [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469 > [3] https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf > [4] https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 > > Signed-off-by: Hetvi Thakar <hthakar@cisco.com> Hello, I received another similar series 2 hours before yours: https://patchwork.yoctoproject.org/project/oe-core/list/?series=48993 Can you help review it? Regards, -- Yoann Congal Smile ECS [-- Attachment #2: Type: text/html, Size: 7679 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-08-20 9:09 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-25 11:31 ` Yoann Congal 2026-08-25 13:07 ` [scarthgap][PATCH " Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 0 siblings, 1 reply; 11+ messages in thread From: Yoann Congal @ 2026-08-25 11:31 UTC (permalink / raw) To: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) Cc: openembedded-core@lists.openembedded.org [-- Attachment #1: Type: text/plain, Size: 3267 bytes --] Le jeu. 20 août 2026 à 11:11, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) <hthakar@cisco.com> a écrit : > Hi Yoann, > I hope you're doing well. > I wanted to follow up on the patch below. It appears it may have been > missed during the review process. Could you please take a look when you > have a chance and share your feedback? > Thank you for your time. > Hello, It was not missed. I've answered that it lacked a master equivalent before I can consider it for wrynose. Has this changed? In that case, can you provide a link to the master commit equivalent to this patch? Regards, > Regards, > Hetvi > > ------------------------------ > *From:* openembedded-core@lists.openembedded.org < > openembedded-core@lists.openembedded.org> on behalf of Hetvi Thakar -X > (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via > lists.openembedded.org <hthakar=cisco.com@lists.openembedded.org> > *Sent:* 23 July 2026 14:15 > *To:* Yoann Congal <yoann.congal@smile.fr>; > openembedded-core@lists.openembedded.org < > openembedded-core@lists.openembedded.org> > *Cc:* xe-linux-external (Internal Group) <xe-linux-external@cisco.com> > *Subject:* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 > > Hi, > > I reviewed the earlier series. > It looks like the follow-up upstream regression fixes for > CVE-2026-58469 and CVE-2026-58472 were not included in the backport. > These follow-up commits are required to complete the backport, and I > have included them in my series . > I kindly request you to review my series as well. > > Thanks, > Hetvi Thakar > ------------------------------ > *From:* Yoann Congal <yoann.congal@smile.fr> > *Sent:* 22 July 2026 23:13 > *To:* Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) < > hthakar@cisco.com>; openembedded-core@lists.openembedded.org < > openembedded-core@lists.openembedded.org> > *Cc:* xe-linux-external (Internal Group) <xe-linux-external@cisco.com> > *Subject:* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 > > On Wed Jul 22, 2026 at 12:12 PM CEST, Hetvi Thakar -X (hthakar - E > INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > > From: Hetvi Thakar <hthakar@cisco.com> > > > > This patch applies the upstream fix as referenced in [2], > > using the commit shown in [1]. > > > > It also includes the upstream follow-up fixes referenced in [3] > > and [4]. These correct the trailing whitespace check introduced > > by the original fix and add the required <ctype.h> include for > > isspace(). > > > > [1] > https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 > > [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469 > > [3] > https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf > > [4] > https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 > > > > Signed-off-by: Hetvi Thakar <hthakar@cisco.com> > > Hello, > > I received another similar series 2 hours before yours: > https://patchwork.yoctoproject.org/project/oe-core/list/?series=48993 > Can you help review it? > > Regards, > -- > Yoann Congal > Smile ECS > > -- Yoann Congal Smile ECS [-- Attachment #2: Type: text/html, Size: 9276 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-08-25 11:31 ` Yoann Congal @ 2026-08-25 13:07 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 2026-08-25 13:26 ` [OE-core] " Yoann Congal 0 siblings, 1 reply; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-25 13:07 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 5074 bytes --] On Tue, Aug 25, 2026 at 05:01 PM, Yoann Congal wrote: > > > > Le jeu. 20 août 2026 à 11:11, Hetvi Thakar -X (hthakar - E INFOCHIPS > PRIVATE LIMITED at Cisco) < hthakar@cisco.com > a écrit : > >> Hi Yoann, >> I hope you're doing well. >> I wanted to follow up on the patch below. It appears it may have been >> missed during the review process. Could you please take a look when you >> have a chance and share your feedback? >> Thank you for your time. >> > > Hello, > > It was not missed. I've answered that it lacked a master equivalent before > I can consider it for wrynose. > Has this changed? In that case, can you provide a link to the master > commit equivalent to this patch? > > Regards, > > >> Regards, >> Hetvi >> >> >> *From:* openembedded-core@lists.openembedded.org < openembedded-core@lists.openembedded.org >> > on behalf of Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at >> Cisco) via lists.openembedded.org ( http://lists.openembedded.org ) <hthakar= >> cisco.com@lists.openembedded.org > >> *Sent:* 23 July 2026 14:15 >> *To:* Yoann Congal < yoann.congal@smile.fr >; openembedded-core@lists.openembedded.org >> < openembedded-core@lists.openembedded.org > >> *Cc:* xe-linux-external (Internal Group) < xe-linux-external@cisco.com > >> *Subject:* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 >> >> Hi, >> >> I reviewed the earlier series. >> It looks like the follow-up upstream regression fixes for >> CVE-2026-58469 and CVE-2026-58472 were not included in the backport. >> These follow-up commits are required to complete the backport, and I >> have included them in my series . >> I kindly request you to review my series as well. >> >> Thanks, >> Hetvi Thakar >> >> *From:* Yoann Congal < yoann.congal@smile.fr > >> *Sent:* 22 July 2026 23:13 >> *To:* Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) < hthakar@cisco.com >> >; openembedded-core@lists.openembedded.org < openembedded-core@lists.openembedded.org >> > >> *Cc:* xe-linux-external (Internal Group) < xe-linux-external@cisco.com > >> *Subject:* Re: [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 >> >> On Wed Jul 22, 2026 at 12:12 PM CEST, Hetvi Thakar -X (hthakar - E >> INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org ( >> http://lists.openembedded.org ) wrote: >> > From: Hetvi Thakar < hthakar@cisco.com > >> > >> > This patch applies the upstream fix as referenced in [2], >> > using the commit shown in [1]. >> > >> > It also includes the upstream follow-up fixes referenced in [3] >> > and [4]. These correct the trailing whitespace check introduced >> > by the original fix and add the required <ctype.h> include for >> > isspace(). >> > >> > [1] https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 >> ( >> https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826 >> ) >> > [2] https://nvd.nist.gov/vuln/detail/CVE-2026-58469 >> > [3] https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf >> ( >> https://gitlab.com/gnuwget/wget/-/commit/7b1cdecc49bc77bde220fc575c8a00386c3f3bcf >> ) >> > [4] https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 >> ( >> https://gitlab.com/gnuwget/wget/-/commit/82d945ff5dc9942b78b2bf736aac298c24fe00a1 >> ) >> > >> > Signed-off-by: Hetvi Thakar < hthakar@cisco.com > >> >> Hello, >> >> I received another similar series 2 hours before yours: >> https://patchwork.yoctoproject.org/project/oe-core/list/?series=48993 >> Can you help review it? >> >> Regards, >> -- >> Yoann Congal >> Smile ECS >> >> >> > > > > -- > Yoann Congal > Smile ECS > > Hi, This was a series of four CVE fixes. The patches for the following three CVEs have already been merged into master: CVE-2026-58469: https://git.openembedded.org/openembedded-core/commit/?id=f55c2f60daa1a125fd36aa254abb16d431b55042 ( https://git.openembedded.org/openembedded-core/commit/?id=f55c2f60daa1a125fd36aa254abb16d431b55042 ) CVE-2026-58471: https://git.openembedded.org/openembedded-core/commit/?id=f910a8beb7bb8fb3b41a240dfdad36f76d6b482e ( https://git.openembedded.org/openembedded-core/commit/?id=f910a8beb7bb8fb3b41a240dfdad36f76d6b482e ) CVE-2026-58472: https://git.openembedded.org/openembedded-core/commit/?id=8a77e738458a75186c3bff6c4a97cd87d3aee632 ( https://git.openembedded.org/openembedded-core/commit/?id=8a77e738458a75186c3bff6c4a97cd87d3aee632 ) The remaining patch for CVE-2026-58470 has also been proposed for master: https://patchwork.yoctoproject.org/project/oe-core/patch/20260722081735.14807-1-amaury.couderc@est.tech/ ( https://patchwork.yoctoproject.org/project/oe-core/patch/20260722081735.14807-1-amaury.couderc@est.tech/ ) May you please review the remaining patch? Once it is reviewed, could you also proceed with the review of the corresponding wrynose and Scarthgap patches? Regards, Hetvi > > > [-- Attachment #2: Type: text/html, Size: 12008 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core] [scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-08-25 13:07 ` [scarthgap][PATCH " Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-25 13:26 ` Yoann Congal 2026-08-27 6:38 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 0 siblings, 1 reply; 11+ messages in thread From: Yoann Congal @ 2026-08-25 13:26 UTC (permalink / raw) To: hthakar, openembedded-core On Tue Aug 25, 2026 at 3:07 PM CEST, Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > On Tue, Aug 25, 2026 at 05:01 PM, Yoann Congal wrote: >> >> Le jeu. 20 août 2026 à 11:11, Hetvi Thakar -X (hthakar - E INFOCHIPS >> PRIVATE LIMITED at Cisco) < hthakar@cisco.com > a écrit : >> >>> Hi Yoann, >>> I hope you're doing well. >>> I wanted to follow up on the patch below. It appears it may have been >>> missed during the review process. Could you please take a look when you >>> have a chance and share your feedback? >>> Thank you for your time. >>> >> It was not missed. I've answered that it lacked a master equivalent before >> I can consider it for wrynose. >> Has this changed? In that case, can you provide a link to the master >> commit equivalent to this patch? > > Hi, Hello, > This was a series of four CVE fixes. The patches for the following > three CVEs have already been merged into master: > > CVE-2026-58469: > https://git.openembedded.org/openembedded-core/commit/?id=f55c2f60daa1a125fd36aa254abb16d431b55042 > > CVE-2026-58471: > https://git.openembedded.org/openembedded-core/commit/?id=f910a8beb7bb8fb3b41a240dfdad36f76d6b482e > > CVE-2026-58472: > https://git.openembedded.org/openembedded-core/commit/?id=8a77e738458a75186c3bff6c4a97cd87d3aee632 I can consider those 3 (hoping for not conflict). > The remaining patch for CVE-2026-58470 has also been proposed for > master: > > https://patchwork.yoctoproject.org/project/oe-core/patch/20260722081735.14807-1-amaury.couderc@est.tech/ > > May you please review the remaining patch? This patch is in the "Superseeded" state and is from a month ago. You can answer on it asking for its status. > Once it is reviewed, could you also proceed with the review of the > corresponding wrynose and Scarthgap patches? I regularly re-evaluate the "Awaiting Upstream" patches but you can expedite this process by pinging here when you see the patch landing on master. In this case, we wait for "wget: fix CVE-2026-58470" landing on master. Regards, -- Yoann Congal Smile ECS ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 2026-08-25 13:26 ` [OE-core] " Yoann Congal @ 2026-08-27 6:38 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) 0 siblings, 0 replies; 11+ messages in thread From: Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-27 6:38 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 2666 bytes --] On Tue, Aug 25, 2026 at 06:56 PM, Yoann Congal wrote: > > On Tue Aug 25, 2026 at 3:07 PM CEST, Hetvi Thakar -X (hthakar - E > INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote: > >> On Tue, Aug 25, 2026 at 05:01 PM, Yoann Congal wrote: >> >>> Le jeu. 20 août 2026 à 11:11, Hetvi Thakar -X (hthakar - E INFOCHIPS >>> PRIVATE LIMITED at Cisco) < hthakar@cisco.com > a écrit : >>> >>> >>>> Hi Yoann, >>>> I hope you're doing well. >>>> I wanted to follow up on the patch below. It appears it may have been >>>> missed during the review process. Could you please take a look when you >>>> have a chance and share your feedback? >>>> Thank you for your time. >>> >>> It was not missed. I've answered that it lacked a master equivalent before >>> >>> I can consider it for wrynose. >>> Has this changed? In that case, can you provide a link to the master >>> commit equivalent to this patch? >> >> Hi, > > Hello, > > >> This was a series of four CVE fixes. The patches for the following >> three CVEs have already been merged into master: >> >> CVE-2026-58469: >> https://git.openembedded.org/openembedded-core/commit/?id=f55c2f60daa1a125fd36aa254abb16d431b55042 >> >> >> CVE-2026-58471: >> https://git.openembedded.org/openembedded-core/commit/?id=f910a8beb7bb8fb3b41a240dfdad36f76d6b482e >> >> >> CVE-2026-58472: >> https://git.openembedded.org/openembedded-core/commit/?id=8a77e738458a75186c3bff6c4a97cd87d3aee632 >> > > I can consider those 3 (hoping for not conflict). > > >> The remaining patch for CVE-2026-58470 has also been proposed for >> master: >> >> https://patchwork.yoctoproject.org/project/oe-core/patch/20260722081735.14807-1-amaury.couderc@est.tech/ >> >> >> May you please review the remaining patch? > > This patch is in the "Superseeded" state and is from a month ago. You > can answer on it asking for its status. > > >> Once it is reviewed, could you also proceed with the review of the >> corresponding wrynose and Scarthgap patches? > > I regularly re-evaluate the "Awaiting Upstream" patches but you can > expedite this process by pinging here when you see the patch landing on > master. > In this case, we wait for "wget: fix CVE-2026-58470" landing on master. > > Regards, > -- > Yoann Congal > Smile ECS Hi Yoann, Thanks for the review. I have submitted the master patch for CVE-2026-58470 wget: Fix CVE-2026-58470 - Patchwork ( https://patchwork.yoctoproject.org/project/oe-core/patch/20260827062321.3825085-1-hthakar@cisco.com/ ) Could you please take a look at it at your convenience? Regards, Hetvi [-- Attachment #2: Type: text/html, Size: 3473 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2026-08-27 6:38 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-22 10:12 [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 2/4] wget: Fix CVE-2026-58470 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 3/4] wget: Fix CVE-2026-58471 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-07-22 10:12 ` [OE-core][scarthgap][PATCH 4/4] wget: Fix CVE-2026-58472 Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-07-22 17:43 ` [OE-core][scarthgap][PATCH 1/4] wget: Fix CVE-2026-58469 Yoann Congal
2026-07-23 8:45 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
[not found] ` <18C4DECEC4DDFC1A.1355869@lists.openembedded.org>
2026-08-20 9:09 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-25 11:31 ` Yoann Congal
2026-08-25 13:07 ` [scarthgap][PATCH " Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-25 13:26 ` [OE-core] " Yoann Congal
2026-08-27 6:38 ` Hetvi Thakar -X (hthakar - E INFOCHIPS PRIVATE LIMITED at Cisco)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox