mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[release-branch.go1.16] misc/wasm, cmd/link: do not let command line args overwrite global data 

On Wasm, wasm_exec.js puts command line arguments at the beginning
of the linear memory (following the "zero page"). Currently there
is no limit for this, and a very long command line can overwrite
the program's data section. Prevent this by limiting the command
line to 4096 bytes, and in the linker ensuring the data section
starts at a high enough address (8192).

(Arguably our address assignment on Wasm is a bit confusing. This
is the minimum fix I can come up with.)

Thanks to Ben Lubar for reporting this issue.

Change by Cherry Mui <cherryyz@google.com>.

For #48797
Fixes #48799
Fixes CVE-2021-38297

Change-Id: I0f50fbb2a5b6d0d047e3c134a88988d9133e4ab3
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1205933
Reviewed-by: Roland Shoemaker <bracewell@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/354591
Trust: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
This commit is contained in:
Michael Knyszek 2021-09-02 16:51:59 -04:00
parent 7d57324030
commit 4548fcc8df
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/wasm/wasm_exec.js
View File

@ -564,6 +564,13 @@
offset += 8; offset += 8;
}); });
// The linker guarantees global data starts from at least wasmMinDataAddr.
// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
const wasmMinDataAddr = 4096 + 4096;
if (offset >= wasmMinDataAddr) {
throw new Error("command line too long");
}
this._inst.exports.run(argc, argv); this._inst.exports.run(argc, argv);
if (this.exited) { if (this.exited) {
this._resolveExitPromise(); this._resolveExitPromise();

11
src/cmd/link/internal/ld/data.go
View File

@ -2330,6 +2330,11 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64
return sect, n, va return sect, n, va
} }
// On Wasm, we reserve 4096 bytes for zero page, then 4096 bytes for wasm_exec.js
// to store command line args. Data sections starts from at least address 8192.
// Keep in sync with wasm_exec.js.
const wasmMinDataAddr = 4096 + 4096
// address assigns virtual addresses to all segments and sections and // address assigns virtual addresses to all segments and sections and
// returns all segments in file order. // returns all segments in file order.
func (ctxt *Link) address() []*sym.Segment { func (ctxt *Link) address() []*sym.Segment {
@ -2339,10 +2344,14 @@ func (ctxt *Link) address() []*sym.Segment {
order = append(order, &Segtext) order = append(order, &Segtext)
Segtext.Rwx = 05 Segtext.Rwx = 05
Segtext.Vaddr = va Segtext.Vaddr = va
for _, s := range Segtext.Sections { for i, s := range Segtext.Sections {
va = uint64(Rnd(int64(va), int64(s.Align))) va = uint64(Rnd(int64(va), int64(s.Align)))
s.Vaddr = va s.Vaddr = va
va += s.Length va += s.Length
if ctxt.IsWasm() && i == 0 && va < wasmMinDataAddr {
va = wasmMinDataAddr
}
} }
Segtext.Length = va - uint64(*FlagTextAddr) Segtext.Length = va - uint64(*FlagTextAddr)