| From bf8c7c575c8a552d9d79deb29e80854dc88528d0 Mon Sep 17 00:00:00 2001 |
| From: Damien Neil <dneil@google.com> |
| Date: Mon, 20 Mar 2023 10:43:19 -0700 |
| Subject: [PATCH] [release-branch.go1.20] mime/multipart: limit parsed mime |
| message sizes |
| |
| Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802456 |
| Reviewed-by: Julie Qiu <julieqiu@google.com> |
| Reviewed-by: Roland Shoemaker <bracewell@google.com> |
| Run-TryBot: Damien Neil <dneil@google.com> |
| Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802611 |
| Reviewed-by: Damien Neil <dneil@google.com> |
| Change-Id: Ifdfa192d54f722d781a4d8c5f35b5fb72d122168 |
| Reviewed-on: https://go-review.googlesource.com/c/go/+/481986 |
| Reviewed-by: Matthew Dempsky <mdempsky@google.com> |
| TryBot-Result: Gopher Robot <gobot@golang.org> |
| Run-TryBot: Michael Knyszek <mknyszek@google.com> |
| Auto-Submit: Michael Knyszek <mknyszek@google.com> |
| |
| Upstream-Status: Backport [https://github.com/golang/go/commit/126a1d02da82f93ede7ce0bd8d3c51ef627f2104] |
| CVE: CVE-2023-24537 |
| Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com> |
| --- |
| src/go/parser/parser_test.go | 16 ++++++++++++++++ |
| src/go/scanner/scanner.go | 5 ++++- |
| 2 files changed, 20 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/go/parser/parser_test.go b/src/go/parser/parser_test.go |
| index 37a6a2b..714557c 100644 |
| --- a/src/go/parser/parser_test.go |
| +++ b/src/go/parser/parser_test.go |
| @@ -738,3 +738,19 @@ func TestScopeDepthLimit(t *testing.T) { |
| } |
| } |
| } |
| + |
| +// TestIssue59180 tests that line number overflow doesn't cause an infinite loop. |
| +func TestIssue59180(t *testing.T) { |
| + testcases := []string{ |
| + "package p\n//line :9223372036854775806\n\n//", |
| + "package p\n//line :1:9223372036854775806\n\n//", |
| + "package p\n//line file:9223372036854775806\n\n//", |
| + } |
| + |
| + for _, src := range testcases { |
| + _, err := ParseFile(token.NewFileSet(), "", src, ParseComments) |
| + if err == nil { |
| + t.Errorf("ParseFile(%s) succeeded unexpectedly", src) |
| + } |
| + } |
| +} |
| diff --git a/src/go/scanner/scanner.go b/src/go/scanner/scanner.go |
| index 00fe2dc..3159d25 100644 |
| --- a/src/go/scanner/scanner.go |
| +++ b/src/go/scanner/scanner.go |
| @@ -246,13 +246,16 @@ func (s *Scanner) updateLineInfo(next, offs int, text []byte) { |
| return |
| } |
| |
| + // Put a cap on the maximum size of line and column numbers. |
| + // 30 bits allows for some additional space before wrapping an int32. |
| + const maxLineCol = 1<<30 - 1 |
| var line, col int |
| i2, n2, ok2 := trailingDigits(text[:i-1]) |
| if ok2 { |
| //line filename:line:col |
| i, i2 = i2, i |
| line, col = n2, n |
| - if col == 0 { |
| + if col == 0 || col > maxLineCol { |
| s.error(offs+i2, "invalid column number: "+string(text[i2:])) |
| return |
| } |
| -- |
| 2.25.1 |
| |