[go/release-branch.go1.19] [release-branch.go1.19] go/scanner: reject large line and column numbers in //line directives
0 views
Skip to first unread message
Gopher Robot (Gerrit)
Apr 4, 2023, 12:47:55 PM4/4/23
to Michael Knyszek, Damien Neil, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Matthew Dempsky, Julie Qiu, Roland Shoemaker, golang-co...@googlegroups.com
Gopher Robot submitted this change.
Approvals:
Michael Knyszek: Run TryBots; Automatically submit change
Matthew Dempsky: Looks good to me, approved
Damien Neil: Looks good to me, approved
Gopher Robot: TryBots succeeded
[release-branch.go1.19] go/scanner: reject large line and column numbers in //line directives
Setting a large line or column number using a //line directive can cause
integer overflow even in small source files.
Limit line and column numbers in //line directives to 2^30-1, which
is small enough to avoid int32 overflow on all reasonbly-sized files.
Fixes CVE-2023-24537
Fixes #59273
For #59180
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802456
Reviewed-by: Julie Qiu <juli...@google.com>
Reviewed-by: Roland Shoemaker <brac...@google.com>
Run-TryBot: Damien Neil <dn...@google.com>
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802611
Reviewed-by: Damien Neil <dn...@google.com>
Change-Id: Ifdfa192d54f722d781a4d8c5f35b5fb72d122168
Reviewed-on: https://go-review.googlesource.com/c/go/+/481986
Reviewed-by: Matthew Dempsky <mdem...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Run-TryBot: Michael Knyszek <mkny...@google.com>
Auto-Submit: Michael Knyszek <mkny...@google.com>
---
M src/go/parser/parser_test.go
M src/go/scanner/scanner.go
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/go/parser/parser_test.go b/src/go/parser/parser_test.go
index 0c27892..15b265f 100644
--- a/src/go/parser/parser_test.go
+++ b/src/go/parser/parser_test.go
@@ -742,3 +742,19 @@
}
}
}
+
+// 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 07e0758..6a7e30b 100644
--- a/src/go/scanner/scanner.go
+++ b/src/go/scanner/scanner.go
@@ -246,13 +246,16 @@
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
}
@@ -262,7 +265,7 @@
line = n
}
- if line == 0 {
+ if line == 0 || line > maxLineCol {
s.error(offs+i, "invalid line number: "+string(text[i:]))
return
}
To view, visit change 481986. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Apr 4, 2023, 12:59:21 PM4/4/23
to Michael Knyszek, Damien Neil, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Matthew Dempsky, Julie Qiu, Roland Shoemaker, golang-co...@googlegroups.com
Gopher Robot submitted this change.
Approvals:
Michael Knyszek: Run TryBots; Automatically submit change; Ignore missing or failing TryBot-Result
Matthew Dempsky: Looks good to me, approved
Objections:
Gopher Robot: TryBots failed
[release-branch.go1.20] go/scanner: reject large line and column numbers in //line directives
Setting a large line or column number using a //line directive can cause
integer overflow even in small source files.
Limit line and column numbers in //line directives to 2^30-1, which
is small enough to avoid int32 overflow on all reasonbly-sized files.
Fixes CVE-2023-24537
For #59180
Fixes #59274
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802456
Reviewed-by: Julie Qiu <juli...@google.com>
Reviewed-by: Roland Shoemaker <brac...@google.com>
Run-TryBot: Damien Neil <dn...@google.com>
Change-Id: Ib9c5cb38428ed34ab129d451b00a2998e72c861c
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802401
TryBot-Result: Security TryBots <security...@go-security-trybots.iam.gserviceaccount.com>
Run-TryBot: Roland Shoemaker <brac...@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/481992
Reviewed-by: Matthew Dempsky <mdem...@google.com>
Auto-Submit: Michael Knyszek <mkny...@google.com>
Run-TryBot: Michael Knyszek <mkny...@google.com>
TryBot-Bypass: Michael Knyszek <mkny...@google.com>
---
M src/go/parser/parser_test.go
M src/go/scanner/scanner.go
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/go/parser/parser_test.go b/src/go/parser/parser_test.go
index 153562d..22b11a0 100644
--- a/src/go/parser/parser_test.go
+++ b/src/go/parser/parser_test.go
@@ -764,3 +764,19 @@
})
}
}
+
+// 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 16958d2..0cd9f59 100644
--- a/src/go/scanner/scanner.go
+++ b/src/go/scanner/scanner.go
@@ -253,13 +253,16 @@
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
}
@@ -269,7 +272,7 @@
line = n
}
- if line == 0 {
+ if line == 0 || line > maxLineCol {
s.error(offs+i, "invalid line number: "+string(text[i:]))
return
}
To view, visit change 481992. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Apr 4, 2023, 1:02:33 PM4/4/23
to Michael Knyszek, Damien Neil, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Matthew Dempsky, Julie Qiu, Roland Shoemaker, golang-co...@googlegroups.com
Gopher Robot submitted this change.
Approvals:
Michael Knyszek: Run TryBots; Automatically submit change; Ignore missing or failing TryBot-Result
Matthew Dempsky: Looks good to me, approved
Objections:
Gopher Robot: TryBots failed
go/scanner: reject large line and column numbers in //line directives
Setting a large line or column number using a //line directive can cause
integer overflow even in small source files.
Limit line and column numbers in //line directives to 2^30-1, which
is small enough to avoid int32 overflow on all reasonbly-sized files.
For #59180
Fixes CVE-2023-24537
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802456
Reviewed-by: Julie Qiu <juli...@google.com>
Reviewed-by: Roland Shoemaker <brac...@google.com>
Run-TryBot: Damien Neil <dn...@google.com>
Change-Id: I149bf34deca532af7994203fa1e6aca3c890ea14
Reviewed-on: https://go-review.googlesource.com/c/go/+/482078
Reviewed-by: Matthew Dempsky <mdem...@google.com>
TryBot-Bypass: Michael Knyszek <mkny...@google.com>
Run-TryBot: Michael Knyszek <mkny...@google.com>
Auto-Submit: Michael Knyszek <mkny...@google.com>
To view, visit change 482078. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages