From 31d3759d72cb3b516f92206c4befc8aca980785d Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Wed, 27 Mar 2024 15:04:33 -0700 Subject: [PATCH 1/3] [release-branch.go1.21] all: update golang.org/x/net Pulls in one HTTP/2 fix: 0b0455d2c9 http2: reject DATA frames after 1xx and before final headers For golang/go#65927 Fixes golang/go#66254 Change-Id: I257b2634f63e8c6039c44dea24c345043c23c8d2 Reviewed-on: https://go-review.googlesource.com/c/go/+/574916 Reviewed-by: Than McIntosh Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI --- h2_bundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h2_bundle.go b/h2_bundle.go index dd59e1f4..032d7fe9 100644 --- a/h2_bundle.go +++ b/h2_bundle.go @@ -9748,7 +9748,7 @@ func (rl *http2clientConnReadLoop) processData(f *http2DataFrame) error { }) return nil } - if !cs.firstByte { + if !cs.pastHeaders { cc.logf("protocol error: received DATA before a HEADERS frame") rl.endStreamError(cs, http2StreamError{ StreamID: f.StreamID, From 39bf8a9388d00b758bbf51362418d0bdb03f4ce2 Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Thu, 28 Mar 2024 16:49:40 -0700 Subject: [PATCH 2/3] [release-branch.go1.21] net/http: update bundled golang.org/x/net/http2 Disable cmd/internal/moddeps test, since this update includes PRIVATE track fixes. Fixes CVE-2023-45288 For #65051 Fixes #65387 Change-Id: I17da6da2fe0dd70062b49f94377875acb34829a1 Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2197267 Reviewed-by: Dmitri Shuralyov Run-TryBot: Damien Neil Reviewed-by: Tatiana Bradley Reviewed-on: https://go-review.googlesource.com/c/go/+/576075 TryBot-Bypass: Dmitri Shuralyov Commit-Queue: Dmitri Shuralyov Auto-Submit: Dmitri Shuralyov Reviewed-by: Than McIntosh --- h2_bundle.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/h2_bundle.go b/h2_bundle.go index 032d7fe9..80c0c962 100644 --- a/h2_bundle.go +++ b/h2_bundle.go @@ -2966,6 +2966,7 @@ func (fr *http2Framer) readMetaFrame(hf *http2HeadersFrame) (*http2MetaHeadersFr if size > remainSize { hdec.SetEmitEnabled(false) mh.Truncated = true + remainSize = 0 return } remainSize -= size @@ -2978,6 +2979,36 @@ func (fr *http2Framer) readMetaFrame(hf *http2HeadersFrame) (*http2MetaHeadersFr var hc http2headersOrContinuation = hf for { frag := hc.HeaderBlockFragment() + + // Avoid parsing large amounts of headers that we will then discard. + // If the sender exceeds the max header list size by too much, + // skip parsing the fragment and close the connection. + // + // "Too much" is either any CONTINUATION frame after we've already + // exceeded the max header list size (in which case remainSize is 0), + // or a frame whose encoded size is more than twice the remaining + // header list bytes we're willing to accept. + if int64(len(frag)) > int64(2*remainSize) { + if http2VerboseLogs { + log.Printf("http2: header list too large") + } + // It would be nice to send a RST_STREAM before sending the GOAWAY, + // but the struture of the server's frame writer makes this difficult. + return nil, http2ConnectionError(http2ErrCodeProtocol) + } + + // Also close the connection after any CONTINUATION frame following an + // invalid header, since we stop tracking the size of the headers after + // an invalid one. + if invalid != nil { + if http2VerboseLogs { + log.Printf("http2: invalid header: %v", invalid) + } + // It would be nice to send a RST_STREAM before sending the GOAWAY, + // but the struture of the server's frame writer makes this difficult. + return nil, http2ConnectionError(http2ErrCodeProtocol) + } + if _, err := hdec.Write(frag); err != nil { return nil, http2ConnectionError(http2ErrCodeCompression) } From 0644209f1d95a2d51df5ffe87af650ea36dae55a Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Mon, 8 Apr 2024 12:46:51 +0000 Subject: [PATCH 3/3] chore: prepare for updating to go1.21.9 --- UPSTREAM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPSTREAM b/UPSTREAM index 3e9ef2da..88edebf1 100644 --- a/UPSTREAM +++ b/UPSTREAM @@ -1 +1 @@ -go1.21.8 +go1.21.9