mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 14:31:00 +00:00
f25b363233
Backport fixes for: * CVE-2023-29402 - Upstream-Status: Backport fromc160b49b6d* CVE-2023-29404 - Upstream-Status: Backport frombf3c8ce03e(From OE-Core rev: a4a989605d8cab3278d6c6e32eb882815ff36a28) Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
From bf3c8ce03e175e870763901a3850bca01381a828 Mon Sep 17 00:00:00 2001
|
|
From: Roland Shoemaker <bracewell@google.com>
|
|
Date: Fri, 5 May 2023 13:10:34 -0700
|
|
Subject: [PATCH] [release-branch.go1.19] cmd/go: enforce flags with
|
|
non-optional arguments
|
|
|
|
Enforce that linker flags which expect arguments get them, otherwise it
|
|
may be possible to smuggle unexpected flags through as the linker can
|
|
consume what looks like a flag as an argument to a preceding flag (i.e.
|
|
"-Wl,-O -Wl,-R,-bad-flag" is interpreted as "-O=-R -bad-flag"). Also be
|
|
somewhat more restrictive in the general format of some flags.
|
|
|
|
Thanks to Juho Nurminen of Mattermost for reporting this issue.
|
|
|
|
Updates #60305
|
|
Fixes #60511
|
|
Fixes CVE-2023-29404
|
|
|
|
Change-Id: Icdffef2c0f644da50261cace6f43742783931cff
|
|
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1876275
|
|
Reviewed-by: Ian Lance Taylor <iant@google.com>
|
|
Reviewed-by: Damien Neil <dneil@google.com>
|
|
(cherry picked from commit 896779503cf754cbdac24b61d4cc953b50fe2dde)
|
|
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1902225
|
|
Run-TryBot: Roland Shoemaker <bracewell@google.com>
|
|
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1904342
|
|
Reviewed-by: Michael Knyszek <mknyszek@google.com>
|
|
Reviewed-on: https://go-review.googlesource.com/c/go/+/501217
|
|
Auto-Submit: Michael Knyszek <mknyszek@google.com>
|
|
Run-TryBot: David Chase <drchase@google.com>
|
|
TryBot-Bypass: Michael Knyszek <mknyszek@google.com>
|
|
|
|
Upstream-Status: Backport [https://github.com/golang/go/commit/bf3c8ce03e175e870763901a3850bca01381a828]
|
|
CVE: CVE-2023-29404
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
src/cmd/go/internal/work/security.go | 6 +++---
|
|
src/cmd/go/internal/work/security_test.go | 5 +++++
|
|
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/cmd/go/internal/work/security.go b/src/cmd/go/internal/work/security.go
|
|
index a823b20..8acb6dc 100644
|
|
--- a/src/cmd/go/internal/work/security.go
|
|
+++ b/src/cmd/go/internal/work/security.go
|
|
@@ -177,17 +177,17 @@ var validLinkerFlags = []*lazyregexp.Regexp{
|
|
re(`-Wl,-Bdynamic`),
|
|
re(`-Wl,-berok`),
|
|
re(`-Wl,-Bstatic`),
|
|
- re(`-WL,-O([^@,\-][^,]*)?`),
|
|
+ re(`-Wl,-O[0-9]+`),
|
|
re(`-Wl,-d[ny]`),
|
|
re(`-Wl,--disable-new-dtags`),
|
|
- re(`-Wl,-e[=,][a-zA-Z0-9]*`),
|
|
+ re(`-Wl,-e[=,][a-zA-Z0-9]+`),
|
|
re(`-Wl,--enable-new-dtags`),
|
|
re(`-Wl,--end-group`),
|
|
re(`-Wl,--(no-)?export-dynamic`),
|
|
re(`-Wl,-framework,[^,@\-][^,]+`),
|
|
re(`-Wl,-headerpad_max_install_names`),
|
|
re(`-Wl,--no-undefined`),
|
|
- re(`-Wl,-R([^@\-][^,@]*$)`),
|
|
+ re(`-Wl,-R,?([^@\-,][^,@]*$)`),
|
|
re(`-Wl,--just-symbols[=,]([^,@\-][^,@]+)`),
|
|
re(`-Wl,-rpath(-link)?[=,]([^,@\-][^,]+)`),
|
|
re(`-Wl,-s`),
|
|
diff --git a/src/cmd/go/internal/work/security_test.go b/src/cmd/go/internal/work/security_test.go
|
|
index bd707ff..7b0b7d3 100644
|
|
--- a/src/cmd/go/internal/work/security_test.go
|
|
+++ b/src/cmd/go/internal/work/security_test.go
|
|
@@ -220,6 +220,11 @@ var badLinkerFlags = [][]string{
|
|
{"-Wl,-R,@foo"},
|
|
{"-Wl,--just-symbols,@foo"},
|
|
{"../x.o"},
|
|
+ {"-Wl,-R,"},
|
|
+ {"-Wl,-O"},
|
|
+ {"-Wl,-e="},
|
|
+ {"-Wl,-e,"},
|
|
+ {"-Wl,-R,-flag"},
|
|
}
|
|
|
|
func TestCheckLinkerFlags(t *testing.T) {
|
|
--
|
|
2.25.1
|
|
|