Skip to contentSkip to conversation

go: Fix CVE-2023-39318

PATCH Superseded Siddharth 2 participants 2 messages Sep 21, 2023 – Sep 22, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Siddharth

author
#0 lore raw

PATCH 1/1 go: Fix CVE-2023-39318

From: Siddharth Doshi <[email protected]>

Upstream-Status: Backport from [https://github.com/golang/go/commit/023b542edf38e2a1f87fcefb9f75ff2f99401b4c]
CVE: CVE-2023-39318

---
 meta/recipes-devtools/go/go-1.17.13.inc       |   1 +
 .../go/go-1.21/CVE-2023-39318.patch           | 238 ++++++++++++++++++
 2 files changed, 239 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.21/CVE-2023-39318.patch
meta/recipes-devtools/go/go-1.17.13.inc +1 -0
index 119ae112af..df7d5d235a 100644
@@ -44,6 +44,7 @@ SRC_URI += "\
     file://CVE-2023-24531_2.patch \
     file://CVE-2023-29409.patch \
     file://CVE-2023-39319.patch \
+    file://CVE-2023-39318.patch \
 "
 SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
 
meta/recipes-devtools/go/go-1.21/CVE-2023-39318.patch new file +238 -0

238 lines not on this page · raw message

Signature · 1 line
2.34.1
#1 lore raw
Quoted 9 lines · Siddharth via lists.openembedded.org

From: Siddharth Doshi <[email protected]>

Upstream-Status: Backport from [https://github.com/golang/go/commit/023b542edf38e2a1f87fcefb9f75ff2f99401b4c]
CVE: CVE-2023-39318

---
 meta/recipes-devtools/go/go-1.17.13.inc       |   1 +
 .../go/go-1.21/CVE-2023-39318.patch           | 238 ++++++++++++++++++

Could you please send a V2 that deals with the fuzz warning?

WARNING: go-cross-core2-64-1.17.13-r0 do_patch: Fuzz detected:

Applying patch CVE-2023-39318.patch
patching file src/html/template/context.go
patching file src/html/template/escape.go
Hunk #1 succeeded at 721 (offset 21 lines).
patching file src/html/template/escape_test.go
Hunk #1 succeeded at 503 with fuzz 2.
patching file src/html/template/state_string.go
patching file src/html/template/transition.go
Hunk #2 succeeded at 270 (offset 5 lines).
Hunk #3 succeeded at 300 (offset 5 lines).
Hunk #4 succeeded at 409 (offset 15 lines).

Thanks!

Steve

Quoted 271 lines
 2 files changed, 239 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.21/CVE-2023-39318.patch
meta/recipes-devtools/go/go-1.17.13.inc +1 -0
index 119ae112af..df7d5d235a 100644
@@ -44,6 +44,7 @@ SRC_URI += "\
     file://CVE-2023-24531_2.patch \
     file://CVE-2023-29409.patch \
     file://CVE-2023-39319.patch \
+    file://CVE-2023-39318.patch \
 "
 SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
 
meta/recipes-devtools/go/go-1.21/CVE-2023-39318.patch new file +238 -1
new file mode 100644
index 0000000000..942af323e0
@@ -0,0 +1,238 @@
+From 023b542edf38e2a1f87fcefb9f75ff2f99401b4c Mon Sep 17 00:00:00 2001
+From: Roland Shoemaker <[email protected]>
+Date: Thu, 3 Aug 2023 12:24:13 -0700
+Subject: [PATCH] [release-branch.go1.20] html/template: support HTML-like
+ comments in script contexts
+
+Per Appendix B.1.1 of the ECMAScript specification, support HTML-like
+comments in script contexts. Also per section 12.5, support hashbang
+comments. This brings our parsing in-line with how browsers treat these
+comment types.
+
+Thanks to Takeshi Kaneko (GMO Cybersecurity by Ierae, Inc.) for
+reporting this issue.
+
+Fixes #62196
+Fixes #62395
+Fixes CVE-2023-39318
+
+Change-Id: Id512702c5de3ae46cf648e268cb10e1eb392a181
+Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1976593
+Run-TryBot: Roland Shoemaker <[email protected]>
+Reviewed-by: Tatiana Bradley <[email protected]>
+Reviewed-by: Damien Neil <[email protected]>
+Reviewed-by: Dmitri Shuralyov <[email protected]>
+Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2014620
+Reviewed-on: https://go-review.googlesource.com/c/go/+/526098
+Run-TryBot: Cherry Mui <[email protected]>
+TryBot-Result: Gopher Robot <[email protected]>
+
+Upstream-Status: Backport from [https://github.com/golang/go/commit/023b542edf38e2a1f87fcefb9f75ff2f99401b4c]
+CVE: CVE-2023-39318
+Signed-off-by: Siddharth Doshi <[email protected]>
+---
+ src/html/template/context.go      |  6 ++-
+ src/html/template/escape.go       |  5 +-
+ src/html/template/escape_test.go  | 10 ++++
+ src/html/template/state_string.go |  4 +-
+ src/html/template/transition.go   | 80 ++++++++++++++++++++-----------
+ 5 files changed, 72 insertions(+), 33 deletions(-)
+
+diff --git a/src/html/template/context.go b/src/html/template/context.go
+index 0b65313..4eb7891 100644
+--- a/src/html/template/context.go
++++ b/src/html/template/context.go
+@@ -124,6 +124,10 @@ const (
+       stateJSBlockCmt
+       // stateJSLineCmt occurs inside a JavaScript // line comment.
+       stateJSLineCmt
++      // stateJSHTMLOpenCmt occurs inside a JavaScript <!-- HTML-like comment.
++      stateJSHTMLOpenCmt
++      // stateJSHTMLCloseCmt occurs inside a JavaScript --> HTML-like comment.
++      stateJSHTMLCloseCmt
+       // stateCSS occurs inside a <style> element or style attribute.
+       stateCSS
+       // stateCSSDqStr occurs inside a CSS double quoted string.
+@@ -149,7 +153,7 @@ const (
+ // authors & maintainers, not for end-users or machines.
+ func isComment(s state) bool {
+       switch s {
+-      case stateHTMLCmt, stateJSBlockCmt, stateJSLineCmt, stateCSSBlockCmt, stateCSSLineCmt:
++      case stateHTMLCmt, stateJSBlockCmt, stateJSLineCmt, stateJSHTMLOpenCmt, stateJSHTMLCloseCmt, stateCSSBlockCmt, stateCSSLineCmt:
+               return true
+       }
+       return false
+diff --git a/src/html/template/escape.go b/src/html/template/escape.go
+index bdccc65..3249c67 100644
+--- a/src/html/template/escape.go
++++ b/src/html/template/escape.go
+@@ -700,9 +700,12 @@ func (e *escaper) escapeText(c context, n *parse.TextNode) context {
+               if c.state != c1.state && isComment(c1.state) && c1.delim == delimNone {
+                       // Preserve the portion between written and the comment start.
+                       cs := i1 - 2
+-                      if c1.state == stateHTMLCmt {
++                      if c1.state == stateHTMLCmt || c1.state == stateJSHTMLOpenCmt {
+                               // "<!--" instead of "/*" or "//"
+                               cs -= 2
++                      } else if c1.state == stateJSHTMLCloseCmt {
++                              // "-->" instead of "/*" or "//"
++                              cs -= 1
+                       }
+                       b.Write(s[written:cs])
+                       written = i1
+diff --git a/src/html/template/escape_test.go b/src/html/template/escape_test.go
+index 4f48afe..69cad08 100644
+--- a/src/html/template/escape_test.go
++++ b/src/html/template/escape_test.go
+@@ -503,6 +503,16 @@ func TestEscape(t *testing.T) {
+                       "<script>var a/*b*///c\nd</script>",
+                       "<script>var a \nd</script>",
+               },
++              {
++                      "JS HTML-like comments",
++                      "<script>before <!-- beep\nbetween\nbefore-->boop\n</script>",
++                      "<script>before \nbetween\nbefore\n</script>",
++              },
++              {
++                      "JS hashbang comment",
++                      "<script>#! beep\n</script>",
++                      "<script>\n</script>",
++              },
+               {
+                       "CSS comments",
+                       "<style>p// paragraph\n" +
+diff --git a/src/html/template/state_string.go b/src/html/template/state_string.go
+index 05104be..b5cfe70 100644
+--- a/src/html/template/state_string.go
++++ b/src/html/template/state_string.go
+@@ -4,9 +4,9 @@ package template
+
+ import "strconv"
+
+-const _state_name = "stateTextstateTagstateAttrNamestateAfterNamestateBeforeValuestateHTMLCmtstateRCDATAstateAttrstateURLstateSrcsetstateJSstateJSDqStrstateJSSqStrstateJSRegexpstateJSBlockCmtstateJSLineCmtstateCSSstateCSSDqStrstateCSSSqStrstateCSSDqURLstateCSSSqURLstateCSSURLstateCSSBlockCmtstateCSSLineCmtstateError"
++const _state_name = "stateTextstateTagstateAttrNamestateAfterNamestateBeforeValuestateHTMLCmtstateRCDATAstateAttrstateURLstateSrcsetstateJSstateJSDqStrstateJSSqStrstateJSBqStrstateJSRegexpstateJSBlockCmtstateJSLineCmtstateJSHTMLOpenCmtstateJSHTMLCloseCmtstateCSSstateCSSDqStrstateCSSSqStrstateCSSDqURLstateCSSSqURLstateCSSURLstateCSSBlockCmtstateCSSLineCmtstateErrorstateDead"
+
+-var _state_index = [...]uint16{0, 9, 17, 30, 44, 60, 72, 83, 92, 100, 111, 118, 130, 142, 155, 170, 184, 192, 205, 218, 231, 244, 255, 271, 286, 296}
++var _state_index = [...]uint16{0, 9, 17, 30, 44, 60, 72, 83, 92, 100, 111, 118, 130, 142, 154, 167, 182, 196, 214, 233, 241, 254, 267, 280, 293, 304, 320, 335, 345, 354}
+
+ func (i state) String() string {
+       if i >= state(len(_state_index)-1) {
+diff --git a/src/html/template/transition.go b/src/html/template/transition.go
+index 92eb351..12aa4c4 100644
+--- a/src/html/template/transition.go
++++ b/src/html/template/transition.go
+@@ -14,32 +14,34 @@ import (
+ // the updated context and the number of bytes consumed from the front of the
+ // input.
+ var transitionFunc = [...]func(context, []byte) (context, int){
+-      stateText:        tText,
+-      stateTag:         tTag,
+-      stateAttrName:    tAttrName,
+-      stateAfterName:   tAfterName,
+-      stateBeforeValue: tBeforeValue,
+-      stateHTMLCmt:     tHTMLCmt,
+-      stateRCDATA:      tSpecialTagEnd,
+-      stateAttr:        tAttr,
+-      stateURL:         tURL,
+-      stateSrcset:      tURL,
+-      stateJS:          tJS,
+-      stateJSDqStr:     tJSDelimited,
+-      stateJSSqStr:     tJSDelimited,
+-      stateJSBqStr:     tJSDelimited,
+-      stateJSRegexp:    tJSDelimited,
+-      stateJSBlockCmt:  tBlockCmt,
+-      stateJSLineCmt:   tLineCmt,
+-      stateCSS:         tCSS,
+-      stateCSSDqStr:    tCSSStr,
+-      stateCSSSqStr:    tCSSStr,
+-      stateCSSDqURL:    tCSSStr,
+-      stateCSSSqURL:    tCSSStr,
+-      stateCSSURL:      tCSSStr,
+-      stateCSSBlockCmt: tBlockCmt,
+-      stateCSSLineCmt:  tLineCmt,
+-      stateError:       tError,
++      stateText:           tText,
++      stateTag:            tTag,
++      stateAttrName:       tAttrName,
++      stateAfterName:      tAfterName,
++      stateBeforeValue:    tBeforeValue,
++      stateHTMLCmt:        tHTMLCmt,
++      stateRCDATA:         tSpecialTagEnd,
++      stateAttr:           tAttr,
++      stateURL:            tURL,
++      stateSrcset:         tURL,
++      stateJS:             tJS,
++      stateJSDqStr:        tJSDelimited,
++      stateJSSqStr:        tJSDelimited,
++      stateJSBqStr:        tJSDelimited,
++      stateJSRegexp:       tJSDelimited,
++      stateJSBlockCmt:     tBlockCmt,
++      stateJSLineCmt:      tLineCmt,
++      stateJSHTMLOpenCmt:  tLineCmt,
++      stateJSHTMLCloseCmt: tLineCmt,
++      stateCSS:            tCSS,
++      stateCSSDqStr:       tCSSStr,
++      stateCSSSqStr:       tCSSStr,
++      stateCSSDqURL:       tCSSStr,
++      stateCSSSqURL:       tCSSStr,
++      stateCSSURL:         tCSSStr,
++      stateCSSBlockCmt:    tBlockCmt,
++      stateCSSLineCmt:     tLineCmt,
++      stateError:          tError,
+ }
+
+ var commentStart = []byte("<!--")
+@@ -263,7 +265,7 @@ func tURL(c context, s []byte) (context, int) {
+
+ // tJS is the context transition function for the JS state.
+ func tJS(c context, s []byte) (context, int) {
+-      i := bytes.IndexAny(s, "\"`'/")
++      i := bytes.IndexAny(s, "\"`'/<-#")
+       if i == -1 {
+               // Entire input is non string, comment, regexp tokens.
+               c.jsCtx = nextJSCtx(s, c.jsCtx)
+@@ -293,6 +295,26 @@ func tJS(c context, s []byte) (context, int) {
+                               err:   errorf(ErrSlashAmbig, nil, 0, "'/' could start a division or regexp: %.32q", s[i:]),
+                       }, len(s)
+               }
++      // ECMAScript supports HTML style comments for legacy reasons, see Appendix
++      // B.1.1 "HTML-like Comments". The handling of these comments is somewhat
++      // confusing. Multi-line comments are not supported, i.e. anything on lines
++      // between the opening and closing tokens is not considered a comment, but
++      // anything following the opening or closing token, on the same line, is
++      // ignored. As such we simply treat any line prefixed with "<!--" or "-->"
++      // as if it were actually prefixed with "//" and move on.
++      case '<':
++              if i+3 < len(s) && bytes.Equal(commentStart, s[i:i+4]) {
++                      c.state, i = stateJSHTMLOpenCmt, i+3
++              }
++      case '-':
++              if i+2 < len(s) && bytes.Equal(commentEnd, s[i:i+3]) {
++                      c.state, i = stateJSHTMLCloseCmt, i+2
++              }
++      // ECMAScript also supports "hashbang" comment lines, see Section 12.5.
++      case '#':
++              if i+1 < len(s) && s[i+1] == '!' {
++                      c.state, i = stateJSLineCmt, i+1
++              }
+       default:
+               panic("unreachable")
+       }
+@@ -372,12 +394,12 @@ func tBlockCmt(c context, s []byte) (context, int) {
+       return c, i + 2
+ }
+
+-// tLineCmt is the context transition function for //comment states.
++// tLineCmt is the context transition function for //comment states, and the JS HTML-like comment state.
+ func tLineCmt(c context, s []byte) (context, int) {
+       var lineTerminators string
+       var endState state
+       switch c.state {
+-      case stateJSLineCmt:
++      case stateJSLineCmt, stateJSHTMLOpenCmt, stateJSHTMLCloseCmt:
+               lineTerminators, endState = "\n\r\u2028\u2029", stateJS
+       case stateCSSLineCmt:
+               lineTerminators, endState = "\n\f\r", stateCSS
+--
+2.25.1
+
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188020): https://lists.openembedded.org/g/openembedded-core/message/188020
Mute This Topic: https://lists.openembedded.org/mt/101504976/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-