72 lines
3.7 KiB
Diff
72 lines
3.7 KiB
Diff
From e7581d44ab3029f863b732f624ba44b1495a2936 Mon Sep 17 00:00:00 2001
|
|
From: Roland Shoemaker <bracewell@google.com>
|
|
Date: Mon, 10 Jun 2024 15:34:12 -0700
|
|
Subject: [PATCH] [Backport] go/parser: track depth in nested element lists
|
|
|
|
CVE: CVE-2024-34155
|
|
Reference: https://go-review.googlesource.com/c/go/+/611238
|
|
|
|
Prevents stack exhaustion with extremely deeply nested literal values,
|
|
i.e. field values in structs.
|
|
|
|
Note: The upstream does not submit this change to go1.17 according to the rules of MinorReleases.
|
|
Corego3.x are based on go1.17.8. Therefore, it need to submit the change to corego3.x.
|
|
|
|
Edited-by: qinlonglong q00508429
|
|
|
|
Fixes #69138
|
|
Fixes CVE-2024-34155
|
|
|
|
Change-Id: I2e8e33b44105cc169d7ed1ae83fb56df0c10f1ee
|
|
Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/1520
|
|
Reviewed-by: Robert Griesemer gri@google.com
|
|
Reviewed-by: Damien Neil dneil@google.com
|
|
Reviewed-by: Russ Cox rsc@google.com
|
|
Reviewed-on: https://go-review.googlesource.com/c/go/+/611238
|
|
LUCI-TryBot-Result: Go LUCI golang-scoped@luci-project-accounts.iam.gserviceaccount.com
|
|
Reviewed-by: Roland Shoemaker roland@golang.org
|
|
Reviewed-by: Dmitri Shuralyov dmitshur@google.com
|
|
Auto-Submit: Dmitri Shuralyov dmitshur@golang.org
|
|
Signed-off-by: QinLongLong qinlonglong@huawei.com
|
|
---
|
|
src/go/parser/parser.go | 2 ++
|
|
src/go/parser/parser_test.go | 9 +++++----
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/go/parser/parser.go b/src/go/parser/parser.go
|
|
index 2c42b9f8cc..a728d9a68a 100644
|
|
--- a/src/go/parser/parser.go
|
|
+++ b/src/go/parser/parser.go
|
|
@@ -1481,6 +1481,8 @@ func (p *parser) parseElementList() (list []ast.Expr) {
|
|
}
|
|
|
|
func (p *parser) parseLiteralValue(typ ast.Expr) ast.Expr {
|
|
+ defer decNestLev(incNestLev(p))
|
|
+
|
|
if p.trace {
|
|
defer un(trace(p, "LiteralValue"))
|
|
}
|
|
diff --git a/src/go/parser/parser_test.go b/src/go/parser/parser_test.go
|
|
index 993df6315f..b2cd501a44 100644
|
|
--- a/src/go/parser/parser_test.go
|
|
+++ b/src/go/parser/parser_test.go
|
|
@@ -607,10 +607,11 @@ var parseDepthTests = []struct {
|
|
{name: "chan2", format: "package main; var x «<-chan »int"},
|
|
{name: "interface", format: "package main; var x «interface { M() «int» }»", scope: true, scopeMultiplier: 2}, // Scopes: InterfaceType, FuncType
|
|
{name: "map", format: "package main; var x «map[int]»int"},
|
|
- {name: "slicelit", format: "package main; var x = «[]any{«»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
|
|
- {name: "arraylit", format: "package main; var x = «[1]any{«nil»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
|
|
- {name: "structlit", format: "package main; var x = «struct{x any}{«nil»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
|
|
- {name: "maplit", format: "package main; var x = «map[int]any{1:«nil»}»", parseMultiplier: 2}, // Parser nodes: CompositeLit, KeyValueExpr
|
|
+ {name: "slicelit", format: "package main; var x = []any{«[]any{«»}»}", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
|
|
+ {name: "arraylit", format: "package main; var x = «[1]any{«nil»}»", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
|
|
+ {name: "structlit", format: "package main; var x = «struct{x any}{«nil»}»", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
|
|
+ {name: "maplit", format: "package main; var x = «map[int]any{1:«nil»}»", parseMultiplier: 3}, // Parser nodes: CompositeLit, KeyValueExpr
|
|
+ {name: "element", format: "package main; var x = struct{x any}{x: «{«»}»}"},
|
|
{name: "dot", format: "package main; var x = «x.»x"},
|
|
{name: "index", format: "package main; var x = x«[1]»"},
|
|
{name: "slice", format: "package main; var x = x«[1:2]»"},
|
|
--
|
|
2.33.0
|
|
|