Re: [OE-core][dunfell][PATCH] go: Fix CVE-2023-29400
Hi Ashish,
Unfortunately I'm getting fuzz warnings with your patch:
WARNING: go-native-1.14.15-r0 do_patch: Fuzz detected:
Applying patch CVE-2023-29400.patch
patching file src/html/template/escape.go
Hunk #1 succeeded at 360 (offset -22 lines).
patching file src/html/template/escape_test.go
patching file src/html/template/html.go
Hunk #1 succeeded at 14 with fuzz 2.
Please correct and send a v2.
Thanks!
Steve
On Tue, Jun 27, 2023 at 1:23 AM Ashish Sharma wrote:
>
> emit filterFailsafe for empty unquoted attr
> value
>
> Signed-off-by: Ashish Sharma
> ---
> meta/recipes-devtools/go/go-1.14.inc | 1 +
> .../go/go-1.14/CVE-2023-29400.patch | 93 +++
> 2 files changed, 94 insertions(+)
> create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
>
> diff --git a/meta/recipes-devtools/go/go-1.14.inc
> b/meta/recipes-devtools/go/go-1.14.inc
> index c544b00b22d..1e0c3fab6fa 100644
> --- a/meta/recipes-devtools/go/go-1.14.inc
> +++ b/meta/recipes-devtools/go/go-1.14.inc
> @@ -66,6 +66,7 @@ SRC_URI += "\
> file://CVE-2023-24538-3.patch \
> file://CVE-2023-24539.patch \
> file://CVE-2023-24540.patch \
> +file://CVE-2023-29400.patch \
> "
>
> 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-29400.patch
> b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
> new file mode 100644
> index 000..cb0419a920e
> --- /dev/null
> +++ b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
> @@ -0,0 +1,93 @@
> +From 0d347544cbca0f42b160424f6bc2458ebcc7b3fc Mon Sep 17 00:00:00 2001
> +From: Roland Shoemaker
> +Date: Thu, 13 Apr 2023 14:01:50 -0700
> +Subject: [PATCH] html/template: emit filterFailsafe for empty unquoted attr
> + value
> +
> +An unquoted action used as an attribute value can result in unsafe
> +behavior if it is empty, as HTML normalization will result in unexpected
> +attributes, and may allow attribute injection. If executing a template
> +results in a empty unquoted attribute value, emit filterFailsafe
> +instead.
> +
> +Thanks to Juho Nurminen of Mattermost for reporting this issue.
> +
> +Fixes #59722
> +Fixes CVE-2023-29400
> +
> +Change-Id: Ia38d1b536ae2b4af5323a6c6d861e3c057c2570a
> +Reviewed-on:
> https://team-review.git.corp.google.com/c/golang/go-private/+/1826631
> +Reviewed-by: Julie Qiu
> +Run-TryBot: Roland Shoemaker
> +Reviewed-by: Damien Neil
> +Reviewed-on: https://go-review.googlesource.com/c/go/+/491617
> +Run-TryBot: Carlos Amedee
> +Reviewed-by: Dmitri Shuralyov
> +Reviewed-by: Dmitri Shuralyov
> +TryBot-Result: Gopher Robot
> +
> +Upstream-Status: Backport from
> [https://github.com/golang/go/commit/0d347544cbca0f42b160424f6bc2458ebcc7b3fc]
> +CVE: CVE-2023-29400
> +Signed-off-by: Ashish Sharma
> +---
> + src/html/template/escape.go | 5 ++---
> + src/html/template/escape_test.go | 15 +++
> + src/html/template/html.go| 3 +++
> + 3 files changed, 20 insertions(+), 3 deletions(-)
> +
> +diff --git a/src/html/template/escape.go b/src/html/template/escape.go
> +index 4ba1d6b31897e..a62ef159f0dcd 100644
> +--- a/src/html/template/escape.go
> b/src/html/template/escape.go
> +@@ -382,9 +382,8 @@ func normalizeEscFn(e string) string {
> + // for all x.
> + var redundantFuncs = map[string]map[string]bool{
> + "_html_template_commentescaper": {
> +- "_html_template_attrescaper":true,
> +- "_html_template_nospaceescaper": true,
> +- "_html_template_htmlescaper":true,
> ++ "_html_template_attrescaper": true,
> ++ "_html_template_htmlescaper": true,
> + },
> + "_html_template_cssescaper": {
> + "_html_template_attrescaper": true,
> +diff --git a/src/html/template/escape_test.go
> b/src/html/template/escape_test.go
> +index 3dd212bac9406..f8b2b448f2dfa 100644
> +--- a/src/html/template/escape_test.go
> b/src/html/template/escape_test.go
> +@@ -678,6 +678,21 @@ func TestEscape(t *testing.T) {
> + ` srcset={{""}}>`,
> + ` srcset=>`,
> + },
> ++ {
> ++ "unquoted empty attribute value (plaintext)",
> ++ "",
> ++ "",
> ++ },
> ++ {
> ++ "unquoted empty attribute value (url)",
> ++ "",
> ++ "",
> ++ },
> ++ {
> ++ "quoted empty attribute value",
> ++ "",
> ++ "",
> ++ },
> + }
> +
> + for _, test := range tests {
> +diff --git a/src/html/template/html.go b/src/html/template/html.go
> +index bcca0b51a0ef9..a181699a5bda8 100644
> +---
[OE-core][dunfell][PATCH] go: Fix CVE-2023-29400
emit filterFailsafe for empty unquoted attr
value
Signed-off-by: Ashish Sharma
---
meta/recipes-devtools/go/go-1.14.inc | 1 +
.../go/go-1.14/CVE-2023-29400.patch | 93 +++
2 files changed, 94 insertions(+)
create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
diff --git a/meta/recipes-devtools/go/go-1.14.inc
b/meta/recipes-devtools/go/go-1.14.inc
index c544b00b22d..1e0c3fab6fa 100644
--- a/meta/recipes-devtools/go/go-1.14.inc
+++ b/meta/recipes-devtools/go/go-1.14.inc
@@ -66,6 +66,7 @@ SRC_URI += "\
file://CVE-2023-24538-3.patch \
file://CVE-2023-24539.patch \
file://CVE-2023-24540.patch \
+file://CVE-2023-29400.patch \
"
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-29400.patch
b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
new file mode 100644
index 000..cb0419a920e
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch
@@ -0,0 +1,93 @@
+From 0d347544cbca0f42b160424f6bc2458ebcc7b3fc Mon Sep 17 00:00:00 2001
+From: Roland Shoemaker
+Date: Thu, 13 Apr 2023 14:01:50 -0700
+Subject: [PATCH] html/template: emit filterFailsafe for empty unquoted attr
+ value
+
+An unquoted action used as an attribute value can result in unsafe
+behavior if it is empty, as HTML normalization will result in unexpected
+attributes, and may allow attribute injection. If executing a template
+results in a empty unquoted attribute value, emit filterFailsafe
+instead.
+
+Thanks to Juho Nurminen of Mattermost for reporting this issue.
+
+Fixes #59722
+Fixes CVE-2023-29400
+
+Change-Id: Ia38d1b536ae2b4af5323a6c6d861e3c057c2570a
+Reviewed-on:
https://team-review.git.corp.google.com/c/golang/go-private/+/1826631
+Reviewed-by: Julie Qiu
+Run-TryBot: Roland Shoemaker
+Reviewed-by: Damien Neil
+Reviewed-on: https://go-review.googlesource.com/c/go/+/491617
+Run-TryBot: Carlos Amedee
+Reviewed-by: Dmitri Shuralyov
+Reviewed-by: Dmitri Shuralyov
+TryBot-Result: Gopher Robot
+
+Upstream-Status: Backport from
[https://github.com/golang/go/commit/0d347544cbca0f42b160424f6bc2458ebcc7b3fc]
+CVE: CVE-2023-29400
+Signed-off-by: Ashish Sharma
+---
+ src/html/template/escape.go | 5 ++---
+ src/html/template/escape_test.go | 15 +++
+ src/html/template/html.go| 3 +++
+ 3 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/src/html/template/escape.go b/src/html/template/escape.go
+index 4ba1d6b31897e..a62ef159f0dcd 100644
+--- a/src/html/template/escape.go
b/src/html/template/escape.go
+@@ -382,9 +382,8 @@ func normalizeEscFn(e string) string {
+ // for all x.
+ var redundantFuncs = map[string]map[string]bool{
+ "_html_template_commentescaper": {
+- "_html_template_attrescaper":true,
+- "_html_template_nospaceescaper": true,
+- "_html_template_htmlescaper":true,
++ "_html_template_attrescaper": true,
++ "_html_template_htmlescaper": true,
+ },
+ "_html_template_cssescaper": {
+ "_html_template_attrescaper": true,
+diff --git a/src/html/template/escape_test.go
b/src/html/template/escape_test.go
+index 3dd212bac9406..f8b2b448f2dfa 100644
+--- a/src/html/template/escape_test.go
b/src/html/template/escape_test.go
+@@ -678,6 +678,21 @@ func TestEscape(t *testing.T) {
+ ``,
+ ``,
+ },
++ {
++ "unquoted empty attribute value (plaintext)",
++ "",
++ "",
++ },
++ {
++ "unquoted empty attribute value (url)",
++ "",
++ "",
++ },
++ {
++ "quoted empty attribute value",
++ "",
++ "",
++ },
+ }
+
+ for _, test := range tests {
+diff --git a/src/html/template/html.go b/src/html/template/html.go
+index bcca0b51a0ef9..a181699a5bda8 100644
+--- a/src/html/template/html.go
b/src/html/template/html.go
+@@ -14,6 +14,9 @@ import (
+ // htmlNospaceEscaper escapes for inclusion in unquoted attribute values.
+ func htmlNospaceEscaper(args ...any) string {
+ s, t := stringify(args...)
++ if s == "" {
++ return filterFailsafe
++ }
+ if t == contentTypeHTML {
+ return htmlReplacer(stripTags(s),
htmlNospaceNormReplacementTable, false)
+ }
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183485):
https://lists.openembedded.org/g/openembedded-core/message/183485
Mute This Topic: https://lists.openembedded.org/mt/99807269/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe:
