File 1121-erts-Fix-FRAME_POINTER-to-be-valid-when-st... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1121-erts-Fix-FRAME_POINTER-to-be-valid-when-stack-adjust.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Currently displaying revision ec1c7b677b97434a36bbda872e0ed27c , Show latest

From 69e36b2ecb747823eb98f95fab035b0f2962b671 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 9 Aug 2021 11:02:22 +0200
Subject: [PATCH] erts: Fix FRAME_POINTER to be valid when stack adjusted

The frame pointer is not used by anything after hibernate, but some
ASSERTS assume that it is correct so we set it to the correct value
after the stack has been dropped when we hibernate.

Fault found by Max Federov and can be reproduced by running
hibernate_SUITE with the flags -emu_type debug +JPperf true.
---
 erts/emulator/beam/beam_common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/erts/emulator/beam/beam_common.c b/erts/emulator/beam/beam_common.c
index bf3fede0f7..14e1e90817 100644
--- a/erts/emulator/beam/beam_common.c
+++ b/erts/emulator/beam/beam_common.c
@@ -1661,6 +1661,7 @@ erts_hibernate(Process* c_p, Eterm* reg)
         ASSERT(c_p->stop[0] == make_cp(beam_normal_exit));
         break;
     case ERTS_FRAME_LAYOUT_FP_RA:
+        FRAME_POINTER(c_p) = &c_p->stop[0];
         ASSERT(c_p->stop[0] == make_cp(NULL));
         ASSERT(c_p->stop[1] == make_cp(beam_normal_exit));
         break;
-- 
2.31.1

Places

File 1121-erts-Fix-FRAME_POINTER-to-be-valid-when-stack-adjust.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Places