golang: Fix CVE-2022-2879\
PATCH 1/1 golang: Fix CVE-2022-2879\
Reader.Read doesn't set a limit on the maximum size of file headers.
Upstream-Status: Backport from [https://github.com/golang/go/commit/0a723816cd205576945fa57fbdde7e6532d59d08]
CVE: CVE-2022-2879
--- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2022-2879.patch | 202 ++++++++++++++++++ 2 files changed, 203 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch
meta/recipes-devtools/go/go-1.17.13.inc +1 -0
@@ -17,6 +17,7 @@ SRC_URI += "\ file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://CVE-2022-27664.patch \ + file://CVE-2022-2879.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch new file +202 -0
202 lines not on this page · raw message
Signature · 1 line
2.35.5
Quoted 170 lines · Ashish Sharma
Reader.Read doesn't set a limit on the maximum size of file headers.
Upstream-Status: Backport from [https://github.com/golang/go/commit/0a723816cd205576945fa57fbdde7e6532d59d08]
CVE: CVE-2022-2879Signed-off-by Ashish Sharma <[email protected]>--- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2022-2879.patch | 202 ++++++++++++++++++ 2 files changed, 203 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patchmeta/recipes-devtools/go/go-1.17.13.inc +1
-0@@ -17,6 +17,7 @@ SRC_URI += "\ file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://CVE-2022-27664.patch \ + file://CVE-2022-2879.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch new file +140
-0@@ -0,0 +1,202 @@ +From 0a723816cd205576945fa57fbdde7e6532d59d08 Mon Sep 17 00:00:00 2001 +From: Damien Neil <[email protected]> +Date: Fri, 2 Sep 2022 20:45:18 -0700 +Subject: [PATCH] [release-branch.go1.18] archive/tar: limit size of headers + +Upstream-Status: Backport from [https://github.com/golang/go/commit/0a723816cd205576945fa57fbdde7e6532d59d08] +CVE: CVE-2022-2879 +Signed-off-by: Ashish Sharma <[email protected]> + +Set a 1MiB limit on special file blocks (PAX headers, GNU long names, +GNU link names), to avoid reading arbitrarily large amounts of data +into memory. + +Thanks to Adam Korczynski (ADA Logics) and OSS-Fuzz for reporting +this issue. + +Fixes CVE-2022-2879 +Updates #54853 +Fixes #55925 + +Change-Id: I85136d6ff1e0af101a112190e027987ab4335680 +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1565555 +Reviewed-by: Tatiana Bradley <[email protected]> +Run-TryBot: Roland Shoemaker <[email protected]> +Reviewed-by: Roland Shoemaker <[email protected]> +(cherry picked from commit 6ee768cef6b82adf7a90dcf367a1699ef694f3b2) +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1590622 +Reviewed-by: Damien Neil <[email protected]> +Reviewed-by: Julie Qiu <[email protected]> +Reviewed-on: https://go-review.googlesource.com/c/go/+/438500 +Reviewed-by: Dmitri Shuralyov <[email protected]> +Reviewed-by: Carlos Amedee <[email protected]> +Reviewed-by: Dmitri Shuralyov <[email protected]> +Run-TryBot: Carlos Amedee <[email protected]> +TryBot-Result: Gopher Robot <[email protected]> +--- + src/archive/tar/format.go | 4 +++ + src/archive/tar/reader.go | 14 +++++++-- + src/archive/tar/reader_test.go | 11 ++++++- + .../tar/testdata/pax-bad-hdr-large.tar.bz2 | Bin 0 -> 156 bytes + src/archive/tar/writer.go | 3 ++ + src/archive/tar/writer_test.go | 27 ++++++++++++++++++ + 6 files changed, 56 insertions(+), 3 deletions(-) + create mode 100644 src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2 + +diff --git a/src/archive/tar/format.go b/src/archive/tar/format.go +index 21b9d9d4dbc62..8898c438b513e 100644 +--- a/src/archive/tar/format.go ++++ b/src/archive/tar/format.go +@@ -143,6 +143,10 @@ const ( + blockSize = 512 // Size of each block in a tar stream + nameSize = 100 // Max length of the name field in USTAR format + prefixSize = 155 // Max length of the prefix field in USTAR format ++ ++ // Max length of a special file (PAX header, GNU long name or link). ++ // This matches the limit used by libarchive. ++ maxSpecialFileSize = 1 << 20 + ) + + // blockPadding computes the number of bytes needed to pad offset up to the +diff --git a/src/archive/tar/reader.go b/src/archive/tar/reader.go +index 4b11909bc9527..e609c15f27af7 100644 +--- a/src/archive/tar/reader.go ++++ b/src/archive/tar/reader.go +@@ -103,7 +103,7 @@ func (tr *Reader) next() (*Header, error) { + continue // This is a meta header affecting the next header + case TypeGNULongName, TypeGNULongLink: + format.mayOnlyBe(FormatGNU) +- realname, err := io.ReadAll(tr) ++ realname, err := readSpecialFile(tr) + if err != nil { + return nil, err + } +@@ -293,7 +293,7 @@ func mergePAX(hdr *Header, paxHdrs map[string]string) (err error) { + // parsePAX parses PAX headers. + // If an extended header (type 'x') is invalid, ErrHeader is returned + func parsePAX(r io.Reader) (map[string]string, error) { +- buf, err := io.ReadAll(r) ++ buf, err := readSpecialFile(r) + if err != nil { + return nil, err + } +@@ -828,6 +828,16 @@ func tryReadFull(r io.Reader, b []byte) (n int, err error) { + return n, err + } + ++// readSpecialFile is like io.ReadAll except it returns ++// ErrFieldTooLong if more than maxSpecialFileSize is read. ++func readSpecialFile(r io.Reader) ([]byte, error) { ++ buf, err := io.ReadAll(io.LimitReader(r, maxSpecialFileSize+1)) ++ if len(buf) > maxSpecialFileSize { ++ return nil, ErrFieldTooLong ++ } ++ return buf, err ++} ++ + // discard skips n bytes in r, reporting an error if unable to do so. + func discard(r io.Reader, n int64) error { + // If possible, Seek to the last byte before the end of the data section. +diff --git a/src/archive/tar/reader_test.go b/src/archive/tar/reader_test.go +index f21a6065b4857..140c736429120 100644 +--- a/src/archive/tar/reader_test.go ++++ b/src/archive/tar/reader_test.go +@@ -6,6 +6,7 @@ package tar + + import ( + "bytes" ++ "compress/bzip2" + "crypto/md5" + "errors" + "fmt" +@@ -243,6 +244,9 @@ func TestReader(t *testing.T) { + }, { + file: "testdata/pax-bad-hdr-file.tar", + err: ErrHeader, ++ }, { ++ file: "testdata/pax-bad-hdr-large.tar.bz2", ++ err: ErrFieldTooLong, + }, { + file: "testdata/pax-bad-mtime-file.tar", + err: ErrHeader, +@@ -625,9 +629,14 @@ func TestReader(t *testing.T) { + } + defer f.Close() + ++ var fr io.Reader = f ++ if strings.HasSuffix(v.file, ".bz2") { ++ fr = bzip2.NewReader(fr) ++ } ++ + // Capture all headers and checksums. + var ( +- tr = NewReader(f) ++ tr = NewReader(fr) + hdrs []*Header + chksums []string + rdbuf = make([]byte, 8) +diff --git a/src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2 b/src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2 +new file mode 100644 +index 0000000000000000000000000000000000000000..06bf710d3ae4e96a27487124f08e30c9e318699d
meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch line 150
Quoted 10 lines
meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch new file +10
-0+GIT binary patch +literal 156 +zcmV;N0Av3`T4*^jL0KkKS;SwlM*sj&-;n5#Kmq^806<7UW<Xv*06+)`AOM6LQB%`R +zAoUtF^&Y00G(AA7R6Rgw0K{a`;)ySob}qf{K(WW#h);2a@?<AStKizfO^|VdbRoJj +zqj=52lgiv7w2N0MDEF-8t!>m)Y~!#90LDZj0F4RNS<;o$l$z=JG_q>Xyl@Bs{9VZu +K;X*?Ze#IONT1LeH + +literal 0 +HcmV?d00001 +
This patch fails to apply due to the above binary diff:
ERROR: Applying patch 'CVE-2022-2879.patch' on target directory 'TOPDIR/tmp/work/x86_64-linux/go-cross-cortexa8hf-neon/1.17.13-r0/go' CmdError('quilt --quiltrc TOPDIR/tmp/work/x86_64-linux/go-cross-cortexa8hf-neon/1.17.13-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch CVE-2022-2879.patch
patching file src/archive/tar/format.go
patching file src/archive/tar/reader.go
Hunk #3 succeeded at 826 (offset -2 lines).
patching file src/archive/tar/reader_test.go
File src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2: git binary
diffs are not supported.
patching file src/archive/tar/writer.go
patching file src/archive/tar/writer_test.go
Hunk #1 succeeded at 1006 (offset 2 lines).
Patch CVE-2022-2879.patch does not apply (enforce with -f)
Steve
Quoted 64 lines
meta/recipes-devtools/go/go-1.18/CVE-2022-2879.patch new file +52
-1+diff --git a/src/archive/tar/writer.go b/src/archive/tar/writer.go +index 3729f7e82c192..9b2e3e25d4ceb 100644 +--- a/src/archive/tar/writer.go ++++ b/src/archive/tar/writer.go +@@ -199,6 +199,9 @@ func (tw *Writer) writePAXHeader(hdr *Header, paxHdrs map[string]string) error { + flag = TypeXHeader + } + data := buf.String() ++ if len(data) > maxSpecialFileSize { ++ return ErrFieldTooLong ++ } + if err := tw.writeRawFile(name, data, flag, FormatPAX); err != nil || isGlobal { + return err // Global headers return here + } +diff --git a/src/archive/tar/writer_test.go b/src/archive/tar/writer_test.go +index da3fb89e65e51..640264984a96e 100644 +--- a/src/archive/tar/writer_test.go ++++ b/src/archive/tar/writer_test.go +@@ -1004,6 +1004,33 @@ func TestIssue12594(t *testing.T) { + } + } + ++func TestWriteLongHeader(t *testing.T) { ++ for _, test := range []struct { ++ name string ++ h *Header ++ }{{ ++ name: "name too long", ++ h: &Header{Name: strings.Repeat("a", maxSpecialFileSize)}, ++ }, { ++ name: "linkname too long", ++ h: &Header{Linkname: strings.Repeat("a", maxSpecialFileSize)}, ++ }, { ++ name: "uname too long", ++ h: &Header{Uname: strings.Repeat("a", maxSpecialFileSize)}, ++ }, { ++ name: "gname too long", ++ h: &Header{Gname: strings.Repeat("a", maxSpecialFileSize)}, ++ }, { ++ name: "PAX header too long", ++ h: &Header{PAXRecords: map[string]string{"GOLANG.x": strings.Repeat("a", maxSpecialFileSize)}}, ++ }} { ++ w := NewWriter(io.Discard) ++ if err := w.WriteHeader(test.h); err != ErrFieldTooLong { ++ t.Errorf("%v: w.WriteHeader() = %v, want ErrFieldTooLong", test.name, err) ++ } ++ } ++} ++ + // testNonEmptyWriter wraps an io.Writer and ensures that + // Write is never called with an empty buffer. + type testNonEmptyWriter struct{ io.Writer } --2.35.5
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173691): https://lists.openembedded.org/g/openembedded-core/message/173691
Mute This Topic: https://lists.openembedded.org/mt/95199522/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-