mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 04:06:11 +00:00
95ba88b935
Source: https://github.com/golang/go
MR: 121912
Type: Security Fix
Disposition: Backport from 5bc9106458
ChangeID: 0b76a92a774279d7bffc9d6fa05564dfd8371e8c
Description:
CVE-2022-27664 golang: net/http: handle server errors after sending GOAWAY.
(From OE-Core rev: 4e2f723a4288ad4839fac2769e487612252b1d40)
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>
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From 48c9076dcfc2dc894842ff758c8cfae7957c9565 Mon Sep 17 00:00:00 2001
|
|
From: Hitendra Prajapati <hprajapati@mvista.com>
|
|
Date: Thu, 29 Sep 2022 17:06:18 +0530
|
|
Subject: [PATCH] CVE-2022-27664
|
|
|
|
Upstream-Status: Backport [https://github.com/golang/go/commit/5bc9106458fc07851ac324a4157132a91b1f3479]
|
|
CVE: CVE-2022-27664
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
src/net/http/h2_bundle.go | 21 +++++++++++++--------
|
|
1 file changed, 13 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
|
|
index 65d851d..83f2a72 100644
|
|
--- a/src/net/http/h2_bundle.go
|
|
+++ b/src/net/http/h2_bundle.go
|
|
@@ -3254,10 +3254,11 @@ var (
|
|
// name (key). See httpguts.ValidHeaderName for the base rules.
|
|
//
|
|
// Further, http2 says:
|
|
-// "Just as in HTTP/1.x, header field names are strings of ASCII
|
|
-// characters that are compared in a case-insensitive
|
|
-// fashion. However, header field names MUST be converted to
|
|
-// lowercase prior to their encoding in HTTP/2. "
|
|
+//
|
|
+// "Just as in HTTP/1.x, header field names are strings of ASCII
|
|
+// characters that are compared in a case-insensitive
|
|
+// fashion. However, header field names MUST be converted to
|
|
+// lowercase prior to their encoding in HTTP/2. "
|
|
func http2validWireHeaderFieldName(v string) bool {
|
|
if len(v) == 0 {
|
|
return false
|
|
@@ -3446,8 +3447,8 @@ func (s *http2sorter) SortStrings(ss []string) {
|
|
// validPseudoPath reports whether v is a valid :path pseudo-header
|
|
// value. It must be either:
|
|
//
|
|
-// *) a non-empty string starting with '/'
|
|
-// *) the string '*', for OPTIONS requests.
|
|
+// *) a non-empty string starting with '/'
|
|
+// *) the string '*', for OPTIONS requests.
|
|
//
|
|
// For now this is only used a quick check for deciding when to clean
|
|
// up Opaque URLs before sending requests from the Transport.
|
|
@@ -4897,6 +4898,9 @@ func (sc *http2serverConn) startGracefulShutdownInternal() {
|
|
func (sc *http2serverConn) goAway(code http2ErrCode) {
|
|
sc.serveG.check()
|
|
if sc.inGoAway {
|
|
+ if sc.goAwayCode == http2ErrCodeNo {
|
|
+ sc.goAwayCode = code
|
|
+ }
|
|
return
|
|
}
|
|
sc.inGoAway = true
|
|
@@ -6091,8 +6095,9 @@ func (rws *http2responseWriterState) writeChunk(p []byte) (n int, err error) {
|
|
// prior to the headers being written. If the set of trailers is fixed
|
|
// or known before the header is written, the normal Go trailers mechanism
|
|
// is preferred:
|
|
-// https://golang.org/pkg/net/http/#ResponseWriter
|
|
-// https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
|
|
+//
|
|
+// https://golang.org/pkg/net/http/#ResponseWriter
|
|
+// https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
|
|
const http2TrailerPrefix = "Trailer:"
|
|
|
|
// promoteUndeclaredTrailers permits http.Handlers to set trailers
|
|
--
|
|
2.25.1
|
|
|