Skip to content

Commit 052d402

Browse files
committed
runtime: clear mspan.largeType more carefully in the case of arenas
The pointer stored in mspan.largeType is an invalid pointer when the span is an arena. We need to make sure that pointer isn't seen by the garbage collector, as it might barf on it. Make sure we zero the pointer using a uintptr write so the old value isn't picked up by the write barrier. The mspan.largeType field itself is in a NotInHeap struct, so a heap scan won't find it. The only way we find it is when writing it, or when reading it and putting it in a GC-reachable location. I think we might need to audit the runtime to make sure these pointers aren't being passed in places where the GC might (non-conservatively) scan a stack frame it lives in. (It might be ok, many such places are either systemstack or nosplit.) Change-Id: Ie059d054e0da4d48a4c4b3be88b8e1e46ffa7d10 Reviewed-on: https://go-review.googlesource.com/c/go/+/548535 Reviewed-by: Michael Knyszek <[email protected]> Reviewed-by: Keith Randall <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 59275e2 commit 052d402

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/runtime/mgcsweep.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,10 @@ func (sl *sweepLocked) sweep(preserve bool) bool {
796796
s := spanOf(uintptr(unsafe.Pointer(s.largeType)))
797797
mheap_.freeManual(s, spanAllocPtrScalarBits)
798798
})
799-
s.largeType = nil
799+
// Make sure to zero this pointer without putting the old
800+
// value in a write buffer, as the old value might be an
801+
// invalid pointer. See arena.go:(*mheap).allocUserArenaChunk.
802+
*(*uintptr)(unsafe.Pointer(&s.largeType)) = 0
800803
}
801804

802805
// Count the free in the consistent, external stats.

0 commit comments

Comments
 (0)