1*4882a593SmuzhiyunFrom 618120c165669c00a1606505defea6ca755cdc27 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Damien Neil <dneil@google.com> 3*4882a593SmuzhiyunDate: Wed, 30 Nov 2022 16:46:33 -0500 4*4882a593SmuzhiyunSubject: [PATCH] [release-branch.go1.19] net/http: update bundled 5*4882a593Smuzhiyun golang.org/x/net/http2 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunDisable cmd/internal/moddeps test, since this update includes PRIVATE 8*4882a593Smuzhiyuntrack fixes. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunFor #56350. 11*4882a593SmuzhiyunFor #57009. 12*4882a593SmuzhiyunFixes CVE-2022-41717. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunChange-Id: I5c6ce546add81f361dcf0d5123fa4eaaf8f0a03b 15*4882a593SmuzhiyunReviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1663835 16*4882a593SmuzhiyunReviewed-by: Tatiana Bradley <tatianabradley@google.com> 17*4882a593SmuzhiyunReviewed-by: Julie Qiu <julieqiu@google.com> 18*4882a593SmuzhiyunReviewed-on: https://go-review.googlesource.com/c/go/+/455363 19*4882a593SmuzhiyunTryBot-Result: Gopher Robot <gobot@golang.org> 20*4882a593SmuzhiyunRun-TryBot: Jenny Rakoczy <jenny@golang.org> 21*4882a593SmuzhiyunReviewed-by: Michael Pratt <mpratt@google.com> 22*4882a593Smuzhiyun 23*4882a593SmuzhiyunUpstream-Status: Backport [https://github.com/golang/go/commit/618120c165669c00a1606505defea6ca755cdc27] 24*4882a593SmuzhiyunCVE: CVE-2022-41717 25*4882a593SmuzhiyunSigned-off-by: Hitendra Prajapati <hprajapati@mvista.com> 26*4882a593Smuzhiyun--- 27*4882a593Smuzhiyun src/cmd/internal/moddeps/moddeps_test.go | 1 + 28*4882a593Smuzhiyun src/net/http/h2_bundle.go | 18 +++++++++++------- 29*4882a593Smuzhiyun 2 files changed, 12 insertions(+), 7 deletions(-) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyundiff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go 32*4882a593Smuzhiyunindex 3306e29..d48d43f 100644 33*4882a593Smuzhiyun--- a/src/cmd/internal/moddeps/moddeps_test.go 34*4882a593Smuzhiyun+++ b/src/cmd/internal/moddeps/moddeps_test.go 35*4882a593Smuzhiyun@@ -34,6 +34,7 @@ import ( 36*4882a593Smuzhiyun // See issues 36852, 41409, and 43687. 37*4882a593Smuzhiyun // (Also see golang.org/issue/27348.) 38*4882a593Smuzhiyun func TestAllDependencies(t *testing.T) { 39*4882a593Smuzhiyun+ t.Skip("TODO(#57009): 1.19.4 contains unreleased changes from vendored modules") 40*4882a593Smuzhiyun t.Skip("TODO(#53977): 1.18.5 contains unreleased changes from vendored modules") 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun goBin := testenv.GoToolPath(t) 43*4882a593Smuzhiyundiff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go 44*4882a593Smuzhiyunindex 6e2ef30..9d6abd8 100644 45*4882a593Smuzhiyun--- a/src/net/http/h2_bundle.go 46*4882a593Smuzhiyun+++ b/src/net/http/h2_bundle.go 47*4882a593Smuzhiyun@@ -4189,6 +4189,7 @@ type http2serverConn struct { 48*4882a593Smuzhiyun headerTableSize uint32 49*4882a593Smuzhiyun peerMaxHeaderListSize uint32 // zero means unknown (default) 50*4882a593Smuzhiyun canonHeader map[string]string // http2-lower-case -> Go-Canonical-Case 51*4882a593Smuzhiyun+ canonHeaderKeysSize int // canonHeader keys size in bytes 52*4882a593Smuzhiyun writingFrame bool // started writing a frame (on serve goroutine or separate) 53*4882a593Smuzhiyun writingFrameAsync bool // started a frame on its own goroutine but haven't heard back on wroteFrameCh 54*4882a593Smuzhiyun needsFrameFlush bool // last frame write wasn't a flush 55*4882a593Smuzhiyun@@ -4368,6 +4369,13 @@ func (sc *http2serverConn) condlogf(err error, format string, args ...interface{ 56*4882a593Smuzhiyun } 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun+// maxCachedCanonicalHeadersKeysSize is an arbitrarily-chosen limit on the size 60*4882a593Smuzhiyun+// of the entries in the canonHeader cache. 61*4882a593Smuzhiyun+// This should be larger than the size of unique, uncommon header keys likely to 62*4882a593Smuzhiyun+// be sent by the peer, while not so high as to permit unreasonable memory usage 63*4882a593Smuzhiyun+// if the peer sends an unbounded number of unique header keys. 64*4882a593Smuzhiyun+const http2maxCachedCanonicalHeadersKeysSize = 2048 65*4882a593Smuzhiyun+ 66*4882a593Smuzhiyun func (sc *http2serverConn) canonicalHeader(v string) string { 67*4882a593Smuzhiyun sc.serveG.check() 68*4882a593Smuzhiyun http2buildCommonHeaderMapsOnce() 69*4882a593Smuzhiyun@@ -4383,14 +4391,10 @@ func (sc *http2serverConn) canonicalHeader(v string) string { 70*4882a593Smuzhiyun sc.canonHeader = make(map[string]string) 71*4882a593Smuzhiyun } 72*4882a593Smuzhiyun cv = CanonicalHeaderKey(v) 73*4882a593Smuzhiyun- // maxCachedCanonicalHeaders is an arbitrarily-chosen limit on the number of 74*4882a593Smuzhiyun- // entries in the canonHeader cache. This should be larger than the number 75*4882a593Smuzhiyun- // of unique, uncommon header keys likely to be sent by the peer, while not 76*4882a593Smuzhiyun- // so high as to permit unreaasonable memory usage if the peer sends an unbounded 77*4882a593Smuzhiyun- // number of unique header keys. 78*4882a593Smuzhiyun- const maxCachedCanonicalHeaders = 32 79*4882a593Smuzhiyun- if len(sc.canonHeader) < maxCachedCanonicalHeaders { 80*4882a593Smuzhiyun+ size := 100 + len(v)*2 // 100 bytes of map overhead + key + value 81*4882a593Smuzhiyun+ if sc.canonHeaderKeysSize+size <= http2maxCachedCanonicalHeadersKeysSize { 82*4882a593Smuzhiyun sc.canonHeader[v] = cv 83*4882a593Smuzhiyun+ sc.canonHeaderKeysSize += size 84*4882a593Smuzhiyun } 85*4882a593Smuzhiyun return cv 86*4882a593Smuzhiyun } 87*4882a593Smuzhiyun-- 88*4882a593Smuzhiyun2.25.1 89*4882a593Smuzhiyun 90