Skip to content

Commit bb6fb92

Browse files
committed
runtime: fix sanity check in stackBarrier
stackBarrier on amd64 sanity checks that it's unwinding the correct entry in the stack barrier array. However, this check is wrong in two ways that make it unlikely to catch anything, right or wrong: 1) It checks that savedLRPtr == SP, but, in fact, it should be that savedLRPtr+8 == SP because the RET that returned to stackBarrier popped the saved LR. However, we didn't notice this check was wrong because, 2) the sense of the conditional branch is also wrong. Fix both of these. Change-Id: I38ba1f652b0168b5b2c11b81637656241262af7c Reviewed-on: https://go-review.googlesource.com/17039 Reviewed-by: Russ Cox <[email protected]>
1 parent 08b80ca commit bb6fb92

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/runtime/asm_amd64.s

+2-1
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,9 @@ TEXT runtime·stackBarrier(SB),NOSPLIT,$0
378378
MOVQ stkbar_savedLRPtr(DX)(BX*1), R8
379379
MOVQ stkbar_savedLRVal(DX)(BX*1), BX
380380
// Assert that we're popping the right saved LR.
381+
ADDQ $8, R8
381382
CMPQ R8, SP
382-
JNE 2(PC)
383+
JEQ 2(PC)
383384
MOVL $0, 0
384385
// Record that this stack barrier was hit.
385386
ADDQ $1, g_stkbarPos(CX)

0 commit comments

Comments
 (0)