From: Deepak Rathore <[email protected]> Upstream Repository: https://github.com/golang/go.git
Bug details: https://nvd.nist.gov/vuln/detail/CVE-2025-61728 Type: Security Fix CVE: CVE-2025-61728 Score: 6.5 Patch: https://github.com/golang/go/commit/3235ef3db85c Signed-off-by: Deepak Rathore <[email protected]> diff --git a/meta/recipes-devtools/go/go-1.22.12.inc b/meta/recipes-devtools/go/go-1.22.12.inc index 46f6ef5d8f..04e380c821 100644 --- a/meta/recipes-devtools/go/go-1.22.12.inc +++ b/meta/recipes-devtools/go/go-1.22.12.inc @@ -33,6 +33,7 @@ SRC_URI += "\ file://CVE-2025-61729.patch \ file://CVE-2025-61730.patch \ file://CVE-2025-61726.patch \ + file://CVE-2025-61728.patch \ " SRC_URI[main.sha256sum] = "012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71" diff --git a/meta/recipes-devtools/go/go/CVE-2025-61728.patch b/meta/recipes-devtools/go/go/CVE-2025-61728.patch new file mode 100644 index 0000000000..99266ed7a8 --- /dev/null +++ b/meta/recipes-devtools/go/go/CVE-2025-61728.patch @@ -0,0 +1,171 @@ +From 727c39f7e6c9dc9d4a40d67f39f68ae8867a2abd Mon Sep 17 00:00:00 2001 +From: Damien Neil <[email protected]> +Date: Tue, 4 Nov 2025 17:00:33 -0800 +Subject: [PATCH] [release-branch.go1.24] archive/zip: reduce CPU usage in + index construction +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Constructing the zip index (which is done once when first opening +a file in an archive) can consume large amounts of CPU when +processing deeply-nested directory paths. + +Switch to a less inefficient algorithm. + +Thanks to Jakub Ciolek for reporting this issue. + + goos: darwin + goarch: arm64 + pkg: archive/zip + cpu: Apple M4 Pro + │ /tmp/bench.0 │ /tmp/bench.1 │ + │ sec/op │ sec/op vs base │ + ReaderOneDeepDir-14 25983.62m ± 2% 46.01m ± 2% -99.82% (p=0.000 n=8) + ReaderManyDeepDirs-14 16.221 ± 1% 2.763 ± 6% -82.96% (p=0.000 n=8) + ReaderManyShallowFiles-14 130.3m ± 1% 128.8m ± 2% -1.20% (p=0.003 n=8) + geomean 3.801 253.9m -93.32% + +Fixes #77102 +Fixes CVE-2025-61728 + +CVE: CVE-2025-61728 +Upstream-Status: Backport [https://github.com/golang/go/commit/3235ef3db85c] + +Change-Id: I2c9c864be01b2a2769eb67fbab1b250aeb8f6c42 +Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/3060 +Reviewed-by: Nicholas Husin <[email protected]> +Reviewed-by: Neal Patel <[email protected]> +Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/3328 +Reviewed-by: Damien Neil <[email protected]> +Reviewed-on: https://go-review.googlesource.com/c/go/+/736703 +TryBot-Bypass: Michael Pratt <[email protected]> +Auto-Submit: Michael Pratt <[email protected]> +Reviewed-by: Junyang Shao <[email protected]> +(cherry picked from commit 3235ef3db85c2d7e797b976822a7addaf6d5ca2a) +Signed-off-by: Deepak Rathore <[email protected]> +--- + src/archive/zip/reader.go | 11 ++++- + src/archive/zip/reader_test.go | 81 ++++++++++++++++++++++++++++++++++ + 2 files changed, 91 insertions(+), 1 deletion(-) + +diff --git a/src/archive/zip/reader.go b/src/archive/zip/reader.go +index 60b34b76ee..8a79f5d140 100644 +--- a/src/archive/zip/reader.go ++++ b/src/archive/zip/reader.go +@@ -830,7 +830,16 @@ func (r *Reader) initFileList() { + continue + } + +- for dir := path.Dir(name); dir != "."; dir = path.Dir(dir) { ++ dir := name ++ for { ++ if idx := strings.LastIndex(dir, "/"); idx < 0 { ++ break ++ } else { ++ dir = dir[:idx] ++ } ++ if dirs[dir] { ++ break ++ } + dirs[dir] = true + } + +diff --git a/src/archive/zip/reader_test.go b/src/archive/zip/reader_test.go +index 9a77c1aa62..278714bf49 100644 +--- a/src/archive/zip/reader_test.go ++++ b/src/archive/zip/reader_test.go +@@ -8,6 +8,7 @@ import ( + "bytes" + "encoding/binary" + "encoding/hex" ++ "fmt" + "internal/obscuretestdata" + "io" + "io/fs" +@@ -1834,3 +1835,83 @@ func TestBaseOffsetPlusOverflow(t *testing.T) { + // as the section reader offset & size were < 0. + NewReader(bytes.NewReader(data), int64(len(data))+1875) + } ++ ++func BenchmarkReaderOneDeepDir(b *testing.B) { ++ var buf bytes.Buffer ++ zw := NewWriter(&buf) ++ ++ for i := range 4000 { ++ name := strings.Repeat("a/", i) + "data" ++ zw.CreateHeader(&FileHeader{ ++ Name: name, ++ Method: Store, ++ }) ++ } ++ ++ if err := zw.Close(); err != nil { ++ b.Fatal(err) ++ } ++ data := buf.Bytes() ++ ++ for b.Loop() { ++ zr, err := NewReader(bytes.NewReader(data), int64(len(data))) ++ if err != nil { ++ b.Fatal(err) ++ } ++ zr.Open("does-not-exist") ++ } ++} ++ ++func BenchmarkReaderManyDeepDirs(b *testing.B) { ++ var buf bytes.Buffer ++ zw := NewWriter(&buf) ++ ++ for i := range 2850 { ++ name := fmt.Sprintf("%x", i) ++ name = strings.Repeat("/"+name, i+1)[1:] ++ ++ zw.CreateHeader(&FileHeader{ ++ Name: name, ++ Method: Store, ++ }) ++ } ++ ++ if err := zw.Close(); err != nil { ++ b.Fatal(err) ++ } ++ data := buf.Bytes() ++ ++ for b.Loop() { ++ zr, err := NewReader(bytes.NewReader(data), int64(len(data))) ++ if err != nil { ++ b.Fatal(err) ++ } ++ zr.Open("does-not-exist") ++ } ++} ++ ++func BenchmarkReaderManyShallowFiles(b *testing.B) { ++ var buf bytes.Buffer ++ zw := NewWriter(&buf) ++ ++ for i := range 310000 { ++ name := fmt.Sprintf("%v", i) ++ zw.CreateHeader(&FileHeader{ ++ Name: name, ++ Method: Store, ++ }) ++ } ++ ++ if err := zw.Close(); err != nil { ++ b.Fatal(err) ++ } ++ data := buf.Bytes() ++ ++ for b.Loop() { ++ zr, err := NewReader(bytes.NewReader(data), int64(len(data))) ++ if err != nil { ++ b.Fatal(err) ++ } ++ zr.Open("does-not-exist") ++ } ++} +-- +2.35.6 -- 2.35.6
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231007): https://lists.openembedded.org/g/openembedded-core/message/231007 Mute This Topic: https://lists.openembedded.org/mt/117770205/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
