diff options
author | Vijay Anusuri <vanusuri@mvista.com> | 2023-05-26 09:09:02 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-06-13 04:00:11 -1000 |
commit | 311a1d59359eba91e38a6dad4d2f00028f8b21a0 (patch) | |
tree | 383fba12a386bb6a7ec10be9b2dcd38e6759863e | |
parent | 7a5aa9259051db18674239720618525b3d77b5f5 (diff) | |
download | poky-311a1d59359eba91e38a6dad4d2f00028f8b21a0.tar.gz |
go: Security fix CVE-2023-24540
Upstream-Status: Backport [https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797]
(From OE-Core rev: e569586ac9095d344967c5b9c4bfb07f70948936)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-devtools/go/go-1.14.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch | 90 |
2 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index d0fbde9cae..2c500e8331 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc | |||
@@ -62,6 +62,7 @@ SRC_URI += "\ | |||
62 | file://CVE-2023-24538-2.patch \ | 62 | file://CVE-2023-24538-2.patch \ |
63 | file://CVE-2023-24538-3.patch \ | 63 | file://CVE-2023-24538-3.patch \ |
64 | file://CVE-2023-24539.patch \ | 64 | file://CVE-2023-24539.patch \ |
65 | file://CVE-2023-24540.patch \ | ||
65 | " | 66 | " |
66 | 67 | ||
67 | SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" | 68 | SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" |
diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch b/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch new file mode 100644 index 0000000000..799a0dfcda --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | From ce7bd33345416e6d8cac901792060591cafc2797 Mon Sep 17 00:00:00 2001 | ||
2 | From: Roland Shoemaker <bracewell@google.com> | ||
3 | Date: Tue, 11 Apr 2023 16:27:43 +0100 | ||
4 | Subject: [PATCH] [release-branch.go1.19] html/template: handle all JS | ||
5 | whitespace characters | ||
6 | |||
7 | Rather than just a small set. Character class as defined by \s [0]. | ||
8 | |||
9 | Thanks to Juho Nurminen of Mattermost for reporting this. | ||
10 | |||
11 | For #59721 | ||
12 | Fixes #59813 | ||
13 | Fixes CVE-2023-24540 | ||
14 | |||
15 | [0] https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes | ||
16 | |||
17 | Change-Id: I56d4fa1ef08125b417106ee7dbfb5b0923b901ba | ||
18 | Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1821459 | ||
19 | Reviewed-by: Julie Qiu <julieqiu@google.com> | ||
20 | Run-TryBot: Roland Shoemaker <bracewell@google.com> | ||
21 | Reviewed-by: Damien Neil <dneil@google.com> | ||
22 | Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1851497 | ||
23 | Run-TryBot: Damien Neil <dneil@google.com> | ||
24 | Reviewed-by: Roland Shoemaker <bracewell@google.com> | ||
25 | Reviewed-on: https://go-review.googlesource.com/c/go/+/491355 | ||
26 | Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> | ||
27 | Reviewed-by: Carlos Amedee <carlos@golang.org> | ||
28 | TryBot-Bypass: Carlos Amedee <carlos@golang.org> | ||
29 | Run-TryBot: Carlos Amedee <carlos@golang.org> | ||
30 | |||
31 | Upstream-Status: Backport [https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797] | ||
32 | CVE: CVE-2023-24540 | ||
33 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
34 | --- | ||
35 | src/html/template/js.go | 8 +++++++- | ||
36 | src/html/template/js_test.go | 11 +++++++---- | ||
37 | 2 files changed, 14 insertions(+), 5 deletions(-) | ||
38 | |||
39 | diff --git a/src/html/template/js.go b/src/html/template/js.go | ||
40 | index fe7054efe5cd8..4e05c1455723f 100644 | ||
41 | --- a/src/html/template/js.go | ||
42 | +++ b/src/html/template/js.go | ||
43 | @@ -13,6 +13,11 @@ import ( | ||
44 | "unicode/utf8" | ||
45 | ) | ||
46 | |||
47 | +// jsWhitespace contains all of the JS whitespace characters, as defined | ||
48 | +// by the \s character class. | ||
49 | +// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Character_classes. | ||
50 | +const jsWhitespace = "\f\n\r\t\v\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff" | ||
51 | + | ||
52 | // nextJSCtx returns the context that determines whether a slash after the | ||
53 | // given run of tokens starts a regular expression instead of a division | ||
54 | // operator: / or /=. | ||
55 | @@ -26,7 +31,8 @@ import ( | ||
56 | // JavaScript 2.0 lexical grammar and requires one token of lookbehind: | ||
57 | // https://www.mozilla.org/js/language/js20-2000-07/rationale/syntax.html | ||
58 | func nextJSCtx(s []byte, preceding jsCtx) jsCtx { | ||
59 | - s = bytes.TrimRight(s, "\t\n\f\r \u2028\u2029") | ||
60 | + // Trim all JS whitespace characters | ||
61 | + s = bytes.TrimRight(s, jsWhitespace) | ||
62 | if len(s) == 0 { | ||
63 | return preceding | ||
64 | } | ||
65 | diff --git a/src/html/template/js_test.go b/src/html/template/js_test.go | ||
66 | index e07c695f7a77d..e52180cc113b5 100644 | ||
67 | --- a/src/html/template/js_test.go | ||
68 | +++ b/src/html/template/js_test.go | ||
69 | @@ -81,14 +81,17 @@ func TestNextJsCtx(t *testing.T) { | ||
70 | {jsCtxDivOp, "0"}, | ||
71 | // Dots that are part of a number are div preceders. | ||
72 | {jsCtxDivOp, "0."}, | ||
73 | + // Some JS interpreters treat NBSP as a normal space, so | ||
74 | + // we must too in order to properly escape things. | ||
75 | + {jsCtxRegexp, "=\u00A0"}, | ||
76 | } | ||
77 | |||
78 | for _, test := range tests { | ||
79 | - if nextJSCtx([]byte(test.s), jsCtxRegexp) != test.jsCtx { | ||
80 | - t.Errorf("want %s got %q", test.jsCtx, test.s) | ||
81 | + if ctx := nextJSCtx([]byte(test.s), jsCtxRegexp); ctx != test.jsCtx { | ||
82 | + t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) | ||
83 | } | ||
84 | - if nextJSCtx([]byte(test.s), jsCtxDivOp) != test.jsCtx { | ||
85 | - t.Errorf("want %s got %q", test.jsCtx, test.s) | ||
86 | + if ctx := nextJSCtx([]byte(test.s), jsCtxDivOp); ctx != test.jsCtx { | ||
87 | + t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) | ||
88 | } | ||
89 | } | ||
90 | |||