Skip to content

Commit 3a275aa

Browse files
aclementsandybons
authored andcommitted
[release-branch.go1.13] runtime: fix rounding in materializeGCProg
materializeGCProg allocates a temporary buffer for unrolling a GC program. Unfortunately, when computing the size of the buffer, it rounds *down* the number of bytes needed to store bitmap before rounding up the number of pages needed to store those bytes. The fact that it rounds up to pages usually mitigates the rounding down, but the type from #37470 exists right on the boundary where this doesn't work: type Sequencer struct { htable [1 << 17]uint32 buf []byte } On 64-bit, this GC bitmap is exactly 8 KiB of zeros, followed by three one bits. Hence, this needs 8193 bytes of storage, but the current math in materializeGCProg rounds *down* the three one bits to 8192 bytes. Since this is exactly pageSize, the next step of rounding up to the page size doesn't mitigate this error, and materializeGCProg allocates a buffer that is one byte too small. runGCProg then writes one byte past the end of this buffer, causing either a segfault (if you're lucky!) or memory corruption. Updates #37470. Fixes #37483. Change-Id: Iad24c463c501cd9b1dc1924bc2ad007991a094a0 Reviewed-on: https://go-review.googlesource.com/c/go/+/224418 Run-TryBot: Austin Clements <[email protected]> Reviewed-by: Cherry Zhang <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 2f6dd92 commit 3a275aa

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/runtime/mbitmap.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,11 @@ Run:
19121912
// The bitmask starts at s.startAddr.
19131913
// The result must be deallocated with dematerializeGCProg.
19141914
func materializeGCProg(ptrdata uintptr, prog *byte) *mspan {
1915-
s := mheap_.allocManual((ptrdata/(8*sys.PtrSize)+pageSize-1)/pageSize, &memstats.gc_sys)
1915+
// Each word of ptrdata needs one bit in the bitmap.
1916+
bitmapBytes := divRoundUp(ptrdata, 8*sys.PtrSize)
1917+
// Compute the number of pages needed for bitmapBytes.
1918+
pages := divRoundUp(bitmapBytes, pageSize)
1919+
s := mheap_.allocManual(pages, &memstats.gc_sys)
19161920
runGCProg(addb(prog, 4), nil, (*byte)(unsafe.Pointer(s.startAddr)), 1)
19171921
return s
19181922
}

src/runtime/stubs.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,13 @@ func round(n, a uintptr) uintptr {
295295
return (n + a - 1) &^ (a - 1)
296296
}
297297

298+
// divRoundUp returns ceil(n / a).
299+
func divRoundUp(n, a uintptr) uintptr {
300+
// a is generally a power of two. This will get inlined and
301+
// the compiler will optimize the division.
302+
return (n + a - 1) / a
303+
}
304+
298305
// checkASM reports whether assembly runtime checks have passed.
299306
func checkASM() bool
300307

0 commit comments

Comments
 (0)