From c6a65c1fb6fae232e808fec68a00c6539c449a5d Mon Sep 17 00:00:00 2001 From: Vanient Date: Sat, 12 Oct 2024 12:01:33 +0800 Subject: [PATCH] [Backport]golang:fix CVE-2024-34155 Signed-off-by: Vanient --- ...-track-depth-in-nested-element-lists.patch | 60 +++++++++++++++++++ golang.spec | 6 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0124-CVE-2024-34155-track-depth-in-nested-element-lists.patch diff --git a/0124-CVE-2024-34155-track-depth-in-nested-element-lists.patch b/0124-CVE-2024-34155-track-depth-in-nested-element-lists.patch new file mode 100644 index 0000000..a1a761f --- /dev/null +++ b/0124-CVE-2024-34155-track-depth-in-nested-element-lists.patch @@ -0,0 +1,60 @@ +commit b232596139dbe96a62edbe3a2a203e856bf556eb +Author: Roland Shoemaker +Date: Mon Jun 10 15:34:12 2024 -0700 + + [release-branch.go1.22] go/parser: track depth in nested element lists + + Prevents stack exhaustion with extremely deeply nested literal values, + i.e. field values in structs. + + Updates #69138 + Fixes #69142 + Fixes CVE-2024-34155 + + Change-Id: I2e8e33b44105cc169d7ed1ae83fb56df0c10f1ee + Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/1520 + Reviewed-by: Robert Griesemer + Reviewed-by: Damien Neil + Reviewed-by: Russ Cox + (cherry picked from commit eb1b038c0d01761694e7a735ef87ac9164c6568e) + Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/1561 + Reviewed-by: Tatiana Bradley + Reviewed-on: https://go-review.googlesource.com/c/go/+/611181 + Reviewed-by: Michael Pratt + TryBot-Bypass: Dmitri Shuralyov + Auto-Submit: Dmitri Shuralyov + Reviewed-by: Dmitri Shuralyov + +diff --git a/src/go/parser/parser.go b/src/go/parser/parser.go +index 17808b366f..f268dea1a6 100644 +--- a/src/go/parser/parser.go ++++ b/src/go/parser/parser.go +@@ -1676,6 +1676,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 43b3416b27..c6dca66760 100644 +--- a/src/go/parser/parser_test.go ++++ b/src/go/parser/parser_test.go +@@ -598,10 +598,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]»"}, diff --git a/golang.spec b/golang.spec index 31f4708..f52545c 100644 --- a/golang.spec +++ b/golang.spec @@ -66,7 +66,7 @@ Name: golang Version: 1.21.4 -Release: 22 +Release: 23 Summary: The Go Programming Language License: BSD and Public Domain URL: https://golang.org/ @@ -140,6 +140,7 @@ Patch6017: backport-0017-release-branch.go1.21-runtime-call-enableMetadataHug.pa Patch6018: backport-0018-release-branch.go1.21-cmd-compile-fix-findIndVar-so-.patch Patch6019: backport-0019-release-branch.go1.21-cmd-compile-fix-escape-analysi.patch Patch6020: backport-0020-release-branch.go1.21-runtime-pprof-fix-generics-fun.patch +Patch6021: 0124-CVE-2024-34155-track-depth-in-nested-element-lists.patch ExclusiveArch: %{golang_arches} @@ -379,6 +380,9 @@ fi %files devel -f go-tests.list -f go-misc.list -f go-src.list %changelog +* Sat Oct 5 2024 Yu Peng - 1.21.4-23 +- fix CVE-2024-34155 + * Wed Oct 09 2024 EulerOSWander <314264452@qq.com> - 1.21.4-22 - runtime/pprof:fix generics function names -- Gitee