mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 13:34:12 +00:00
1a1eceee49
Source: https://github.com/golang/go MR: 120628, 120631 Type: Security Fix Disposition: Backport fromed2f33e1a7&&ed2f33e1a7ChangeID: fbd8d61bdc2e9cb0cdbe9879e02aed218ee93dbe Description: Fixed CVE: 1. CVE-2022-30635 2. CVE-2022-32148 (From OE-Core rev: 2c4fb77f417464d9cd40f0ebd8cc52e6e6ca689e) Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
121 lines
4.9 KiB
Diff
121 lines
4.9 KiB
Diff
From fdd4316737ed5681689a1f40802ffa0805e5b11c Mon Sep 17 00:00:00 2001
|
|
From: Hitendra Prajapati <hprajapati@mvista.com>
|
|
Date: Fri, 26 Aug 2022 12:17:05 +0530
|
|
Subject: [PATCH] CVE-2022-30635
|
|
|
|
Upstream-Status: Backport [https://github.com/golang/go/commit/cd54600b866db0ad068ab8df06c7f5f6cb55c9b3]
|
|
CVE-2022-30635
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
src/encoding/gob/decode.go | 19 ++++++++++++-------
|
|
src/encoding/gob/gobencdec_test.go | 24 ++++++++++++++++++++++++
|
|
2 files changed, 36 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/encoding/gob/decode.go b/src/encoding/gob/decode.go
|
|
index d2f6c74..0e0ec75 100644
|
|
--- a/src/encoding/gob/decode.go
|
|
+++ b/src/encoding/gob/decode.go
|
|
@@ -871,8 +871,13 @@ func (dec *Decoder) decOpFor(wireId typeId, rt reflect.Type, name string, inProg
|
|
return &op
|
|
}
|
|
|
|
+var maxIgnoreNestingDepth = 10000
|
|
+
|
|
// decIgnoreOpFor returns the decoding op for a field that has no destination.
|
|
-func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp) *decOp {
|
|
+func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp, depth int) *decOp {
|
|
+ if depth > maxIgnoreNestingDepth {
|
|
+ error_(errors.New("invalid nesting depth"))
|
|
+ }
|
|
// If this type is already in progress, it's a recursive type (e.g. map[string]*T).
|
|
// Return the pointer to the op we're already building.
|
|
if opPtr := inProgress[wireId]; opPtr != nil {
|
|
@@ -896,7 +901,7 @@ func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp)
|
|
errorf("bad data: undefined type %s", wireId.string())
|
|
case wire.ArrayT != nil:
|
|
elemId := wire.ArrayT.Elem
|
|
- elemOp := dec.decIgnoreOpFor(elemId, inProgress)
|
|
+ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1)
|
|
op = func(i *decInstr, state *decoderState, value reflect.Value) {
|
|
state.dec.ignoreArray(state, *elemOp, wire.ArrayT.Len)
|
|
}
|
|
@@ -904,15 +909,15 @@ func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp)
|
|
case wire.MapT != nil:
|
|
keyId := dec.wireType[wireId].MapT.Key
|
|
elemId := dec.wireType[wireId].MapT.Elem
|
|
- keyOp := dec.decIgnoreOpFor(keyId, inProgress)
|
|
- elemOp := dec.decIgnoreOpFor(elemId, inProgress)
|
|
+ keyOp := dec.decIgnoreOpFor(keyId, inProgress, depth+1)
|
|
+ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1)
|
|
op = func(i *decInstr, state *decoderState, value reflect.Value) {
|
|
state.dec.ignoreMap(state, *keyOp, *elemOp)
|
|
}
|
|
|
|
case wire.SliceT != nil:
|
|
elemId := wire.SliceT.Elem
|
|
- elemOp := dec.decIgnoreOpFor(elemId, inProgress)
|
|
+ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1)
|
|
op = func(i *decInstr, state *decoderState, value reflect.Value) {
|
|
state.dec.ignoreSlice(state, *elemOp)
|
|
}
|
|
@@ -1073,7 +1078,7 @@ func (dec *Decoder) compileSingle(remoteId typeId, ut *userTypeInfo) (engine *de
|
|
func (dec *Decoder) compileIgnoreSingle(remoteId typeId) *decEngine {
|
|
engine := new(decEngine)
|
|
engine.instr = make([]decInstr, 1) // one item
|
|
- op := dec.decIgnoreOpFor(remoteId, make(map[typeId]*decOp))
|
|
+ op := dec.decIgnoreOpFor(remoteId, make(map[typeId]*decOp), 0)
|
|
ovfl := overflow(dec.typeString(remoteId))
|
|
engine.instr[0] = decInstr{*op, 0, nil, ovfl}
|
|
engine.numInstr = 1
|
|
@@ -1118,7 +1123,7 @@ func (dec *Decoder) compileDec(remoteId typeId, ut *userTypeInfo) (engine *decEn
|
|
localField, present := srt.FieldByName(wireField.Name)
|
|
// TODO(r): anonymous names
|
|
if !present || !isExported(wireField.Name) {
|
|
- op := dec.decIgnoreOpFor(wireField.Id, make(map[typeId]*decOp))
|
|
+ op := dec.decIgnoreOpFor(wireField.Id, make(map[typeId]*decOp), 0)
|
|
engine.instr[fieldnum] = decInstr{*op, fieldnum, nil, ovfl}
|
|
continue
|
|
}
|
|
diff --git a/src/encoding/gob/gobencdec_test.go b/src/encoding/gob/gobencdec_test.go
|
|
index 6d2c8db..1b52ecc 100644
|
|
--- a/src/encoding/gob/gobencdec_test.go
|
|
+++ b/src/encoding/gob/gobencdec_test.go
|
|
@@ -12,6 +12,7 @@ import (
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
+ "reflect"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
@@ -796,3 +797,26 @@ func TestNetIP(t *testing.T) {
|
|
t.Errorf("decoded to %v, want 1.2.3.4", ip.String())
|
|
}
|
|
}
|
|
+
|
|
+func TestIngoreDepthLimit(t *testing.T) {
|
|
+ // We don't test the actual depth limit because it requires building an
|
|
+ // extremely large message, which takes quite a while.
|
|
+ oldNestingDepth := maxIgnoreNestingDepth
|
|
+ maxIgnoreNestingDepth = 100
|
|
+ defer func() { maxIgnoreNestingDepth = oldNestingDepth }()
|
|
+ b := new(bytes.Buffer)
|
|
+ enc := NewEncoder(b)
|
|
+ typ := reflect.TypeOf(int(0))
|
|
+ nested := reflect.ArrayOf(1, typ)
|
|
+ for i := 0; i < 100; i++ {
|
|
+ nested = reflect.ArrayOf(1, nested)
|
|
+ }
|
|
+ badStruct := reflect.New(reflect.StructOf([]reflect.StructField{{Name: "F", Type: nested}}))
|
|
+ enc.Encode(badStruct.Interface())
|
|
+ dec := NewDecoder(b)
|
|
+ var output struct{ Hello int }
|
|
+ expectedErr := "invalid nesting depth"
|
|
+ if err := dec.Decode(&output); err == nil || err.Error() != expectedErr {
|
|
+ t.Errorf("Decode didn't fail with depth limit of 100: want %q, got %q", expectedErr, err)
|
|
+ }
|
|
+}
|
|
--
|
|
2.25.1
|
|
|