diff mbox series

[kirkstone] go: fix CVE-2022-41717 Excessive memory use in got server

Message ID 20221221051735.32282-1-hprajapati@mvista.com
State New, archived
Headers show
Series [kirkstone] go: fix CVE-2022-41717 Excessive memory use in got server | expand

Commit Message

Hitendra Prajapati Dec. 21, 2022, 5:17 a.m. UTC 
Upstream-Status: Backport from https://github.com/golang/go/commit/618120c165669c00a1606505defea6ca755cdc27

Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
---
 meta/recipes-devtools/go/go-1.17.13.inc       |  1 +
 .../go/go-1.18/CVE-2022-41717.patch           | 90 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch

Comments

Steve Sakoman Dec. 21, 2022, 3:58 p.m. UTC | #1 
On Tue, Dec 20, 2022 at 7:17 PM Hitendra Prajapati
<hprajapati@mvista.com> wrote:
>
> Upstream-Status: Backport from https://github.com/golang/go/commit/618120c165669c00a1606505defea6ca755cdc27
>
> Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
> ---
>  meta/recipes-devtools/go/go-1.17.13.inc       |  1 +
>  .../go/go-1.18/CVE-2022-41717.patch           | 90 +++++++++++++++++++
>  2 files changed, 91 insertions(+)
>  create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch
>
> diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc
> index 9c467d63b2..b29efe3a2f 100644
> --- a/meta/recipes-devtools/go/go-1.17.13.inc
> +++ b/meta/recipes-devtools/go/go-1.17.13.inc
> @@ -18,6 +18,7 @@ SRC_URI += "\
>      file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
>      file://CVE-2022-27664.patch \
>      file://0001-net-http-httputil-avoid-query-parameter-smuggling.patch \
> +    file://CVE-2022-41717.patch \
>  "
>  SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
>
> diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch b/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch
> new file mode 100644
> index 0000000000..05452ac825
> --- /dev/null
> +++ b/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch
> @@ -0,0 +1,90 @@
> +From 618120c165669c00a1606505defea6ca755cdc27 Mon Sep 17 00:00:00 2001
> +From: Damien Neil <dneil@google.com>
> +Date: Wed, 30 Nov 2022 16:46:33 -0500
> +Subject: [PATCH] [release-branch.go1.19] net/http: update bundled
> + golang.org/x/net/http2
> +
> +Disable cmd/internal/moddeps test, since this update includes PRIVATE
> +track fixes.
> +
> +For #56350.
> +For #57009.
> +Fixes CVE-2022-41717.
> +
> +Change-Id: I5c6ce546add81f361dcf0d5123fa4eaaf8f0a03b
> +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1663835
> +Reviewed-by: Tatiana Bradley <tatianabradley@google.com>
> +Reviewed-by: Julie Qiu <julieqiu@google.com>
> +Reviewed-on: https://go-review.googlesource.com/c/go/+/455363
> +TryBot-Result: Gopher Robot <gobot@golang.org>
> +Run-TryBot: Jenny Rakoczy <jenny@golang.org>
> +Reviewed-by: Michael Pratt <mpratt@google.com>
> +
> +Upstream-Status: Backport [https://github.com/golang/go/commit/618120c165669c00a1606505defea6ca755cdc27]
> +CVE: CVE-2022-41717
> +Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
> +---
> + src/cmd/internal/moddeps/moddeps_test.go |  2 ++
> + src/net/http/h2_bundle.go                | 18 +++++++++++-------
> + 2 files changed, 13 insertions(+), 7 deletions(-)
> +
> +diff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go
> +index 56c3b25..8552c4a 100644
> +--- a/src/cmd/internal/moddeps/moddeps_test.go
> ++++ b/src/cmd/internal/moddeps/moddeps_test.go
> +@@ -34,6 +34,8 @@ import (

This patch doesn't apply for me:

ERROR: go-cross-core2-64-1.17.13-r0 do_patch: Applying patch
'CVE-2022-41717.patch' on target directory
'/home/steve/builds/poky-contrib-kirkstone/build/tmp/work/x86_64-linux/go-cross-core2-64/1.17.13-r0/go'
CmdError('quilt --quiltrc
/home/steve/builds/poky-contrib-kirkstone/build/tmp/work/x86_64-linux/go-cross-core2-64/1.17.13-r0/recipe-sysroot-native/etc/quiltrc
push', 0, 'stdout: Applying patch CVE-2022-41717.patch
patching file src/cmd/internal/moddeps/moddeps_test.go
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- rejects in file
src/cmd/internal/moddeps/moddeps_test.go
patching file src/net/http/h2_bundle.go
Hunk #1 succeeded at 4189 (offset 1 line).
Hunk #2 succeeded at 4369 (offset 1 line).
Hunk #3 succeeded at 4391 (offset 1 line).
Patch CVE-2022-41717.patch does not apply (enforce with -f)

Steve

> + // See issues 36852, 41409, and 43687.
> + // (Also see golang.org/issue/27348.)
> + func TestAllDependencies(t *testing.T) {
> ++      t.Skip("TODO(#57009): 1.19.4 contains unreleased changes from vendored modules")
> ++
> +       goBin := testenv.GoToolPath(t)
> +
> +       // Ensure that all packages imported within GOROOT
> +diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
> +index b049a79..92c2c12 100644
> +--- a/src/net/http/h2_bundle.go
> ++++ b/src/net/http/h2_bundle.go
> +@@ -4188,6 +4188,7 @@ type http2serverConn struct {
> +       headerTableSize             uint32
> +       peerMaxHeaderListSize       uint32            // zero means unknown (default)
> +       canonHeader                 map[string]string // http2-lower-case -> Go-Canonical-Case
> ++      canonHeaderKeysSize         int               // canonHeader keys size in bytes
> +       writingFrame                bool              // started writing a frame (on serve goroutine or separate)
> +       writingFrameAsync           bool              // started a frame on its own goroutine but haven't heard back on wroteFrameCh
> +       needsFrameFlush             bool              // last frame write wasn't a flush
> +@@ -4367,6 +4368,13 @@ func (sc *http2serverConn) condlogf(err error, format string, args ...interface{
> +       }
> + }
> +
> ++// maxCachedCanonicalHeadersKeysSize is an arbitrarily-chosen limit on the size
> ++// of the entries in the canonHeader cache.
> ++// This should be larger than the size of unique, uncommon header keys likely to
> ++// be sent by the peer, while not so high as to permit unreasonable memory usage
> ++// if the peer sends an unbounded number of unique header keys.
> ++const http2maxCachedCanonicalHeadersKeysSize = 2048
> ++
> + func (sc *http2serverConn) canonicalHeader(v string) string {
> +       sc.serveG.check()
> +       http2buildCommonHeaderMapsOnce()
> +@@ -4382,14 +4390,10 @@ func (sc *http2serverConn) canonicalHeader(v string) string {
> +               sc.canonHeader = make(map[string]string)
> +       }
> +       cv = CanonicalHeaderKey(v)
> +-      // maxCachedCanonicalHeaders is an arbitrarily-chosen limit on the number of
> +-      // entries in the canonHeader cache. This should be larger than the number
> +-      // of unique, uncommon header keys likely to be sent by the peer, while not
> +-      // so high as to permit unreaasonable memory usage if the peer sends an unbounded
> +-      // number of unique header keys.
> +-      const maxCachedCanonicalHeaders = 32
> +-      if len(sc.canonHeader) < maxCachedCanonicalHeaders {
> ++      size := 100 + len(v)*2 // 100 bytes of map overhead + key + value
> ++      if sc.canonHeaderKeysSize+size <= http2maxCachedCanonicalHeadersKeysSize {
> +               sc.canonHeader[v] = cv
> ++              sc.canonHeaderKeysSize += size
> +       }
> +       return cv
> + }
> +--
> +2.25.1
> +
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#174900): https://lists.openembedded.org/g/openembedded-core/message/174900
> Mute This Topic: https://lists.openembedded.org/mt/95801606/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc
index 9c467d63b2..b29efe3a2f 100644
--- a/meta/recipes-devtools/go/go-1.17.13.inc
+++ b/meta/recipes-devtools/go/go-1.17.13.inc
@@ -18,6 +18,7 @@  SRC_URI += "\
     file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
     file://CVE-2022-27664.patch \
     file://0001-net-http-httputil-avoid-query-parameter-smuggling.patch \
+    file://CVE-2022-41717.patch \
 "
 SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
 
diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch b/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch
new file mode 100644
index 0000000000..05452ac825
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.18/CVE-2022-41717.patch
@@ -0,0 +1,90 @@ 
+From 618120c165669c00a1606505defea6ca755cdc27 Mon Sep 17 00:00:00 2001
+From: Damien Neil <dneil@google.com>
+Date: Wed, 30 Nov 2022 16:46:33 -0500
+Subject: [PATCH] [release-branch.go1.19] net/http: update bundled
+ golang.org/x/net/http2
+
+Disable cmd/internal/moddeps test, since this update includes PRIVATE
+track fixes.
+
+For #56350.
+For #57009.
+Fixes CVE-2022-41717.
+
+Change-Id: I5c6ce546add81f361dcf0d5123fa4eaaf8f0a03b
+Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1663835
+Reviewed-by: Tatiana Bradley <tatianabradley@google.com>
+Reviewed-by: Julie Qiu <julieqiu@google.com>
+Reviewed-on: https://go-review.googlesource.com/c/go/+/455363
+TryBot-Result: Gopher Robot <gobot@golang.org>
+Run-TryBot: Jenny Rakoczy <jenny@golang.org>
+Reviewed-by: Michael Pratt <mpratt@google.com>
+
+Upstream-Status: Backport [https://github.com/golang/go/commit/618120c165669c00a1606505defea6ca755cdc27]
+CVE: CVE-2022-41717
+Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
+---
+ src/cmd/internal/moddeps/moddeps_test.go |  2 ++
+ src/net/http/h2_bundle.go                | 18 +++++++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go
+index 56c3b25..8552c4a 100644
+--- a/src/cmd/internal/moddeps/moddeps_test.go
++++ b/src/cmd/internal/moddeps/moddeps_test.go
+@@ -34,6 +34,8 @@ import (
+ // See issues 36852, 41409, and 43687.
+ // (Also see golang.org/issue/27348.)
+ func TestAllDependencies(t *testing.T) {
++	t.Skip("TODO(#57009): 1.19.4 contains unreleased changes from vendored modules")
++
+ 	goBin := testenv.GoToolPath(t)
+ 
+ 	// Ensure that all packages imported within GOROOT
+diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
+index b049a79..92c2c12 100644
+--- a/src/net/http/h2_bundle.go
++++ b/src/net/http/h2_bundle.go
+@@ -4188,6 +4188,7 @@ type http2serverConn struct {
+ 	headerTableSize             uint32
+ 	peerMaxHeaderListSize       uint32            // zero means unknown (default)
+ 	canonHeader                 map[string]string // http2-lower-case -> Go-Canonical-Case
++	canonHeaderKeysSize         int               // canonHeader keys size in bytes
+ 	writingFrame                bool              // started writing a frame (on serve goroutine or separate)
+ 	writingFrameAsync           bool              // started a frame on its own goroutine but haven't heard back on wroteFrameCh
+ 	needsFrameFlush             bool              // last frame write wasn't a flush
+@@ -4367,6 +4368,13 @@ func (sc *http2serverConn) condlogf(err error, format string, args ...interface{
+ 	}
+ }
+ 
++// maxCachedCanonicalHeadersKeysSize is an arbitrarily-chosen limit on the size
++// of the entries in the canonHeader cache.
++// This should be larger than the size of unique, uncommon header keys likely to
++// be sent by the peer, while not so high as to permit unreasonable memory usage
++// if the peer sends an unbounded number of unique header keys.
++const http2maxCachedCanonicalHeadersKeysSize = 2048
++
+ func (sc *http2serverConn) canonicalHeader(v string) string {
+ 	sc.serveG.check()
+ 	http2buildCommonHeaderMapsOnce()
+@@ -4382,14 +4390,10 @@ func (sc *http2serverConn) canonicalHeader(v string) string {
+ 		sc.canonHeader = make(map[string]string)
+ 	}
+ 	cv = CanonicalHeaderKey(v)
+-	// maxCachedCanonicalHeaders is an arbitrarily-chosen limit on the number of
+-	// entries in the canonHeader cache. This should be larger than the number
+-	// of unique, uncommon header keys likely to be sent by the peer, while not
+-	// so high as to permit unreaasonable memory usage if the peer sends an unbounded
+-	// number of unique header keys.
+-	const maxCachedCanonicalHeaders = 32
+-	if len(sc.canonHeader) < maxCachedCanonicalHeaders {
++	size := 100 + len(v)*2 // 100 bytes of map overhead + key + value
++	if sc.canonHeaderKeysSize+size <= http2maxCachedCanonicalHeadersKeysSize {
+ 		sc.canonHeader[v] = cv
++		sc.canonHeaderKeysSize += size
+ 	}
+ 	return cv
+ }
+-- 
+2.25.1
+