Skip to content

C
criu
Commit f63777d2 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov
Browse files
Options

restorer: Setup rt_sigframe to a proper address 

Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
parent 345834ec
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 13 deletions
cr-restore.c
View file @ f63777d2
...@@ -1303,7 +1303,7 @@ static void restorer_test(pid_t pid) ...@@ -1303,7 +1303,7 @@ static void restorer_test(pid_t pid)
* Pass arguments and run a command. * Pass arguments and run a command.
*/ */
args = (struct restore_core_args *)(exec_start + args_offset); args = (struct restore_core_args *)(exec_start + args_offset);
args->rt_sigframe = (void *)((long)exec_mem + RESTORER_STACK_SIZE + RESTORER_STACK_REDZONE); args->rt_sigframe = (void *)((long)exec_mem + RESTORER_STACK_SIZE + RESTORER_STACK_FRAME - RESTORER_STACK_REDZONE);
args->self_entry = exec_mem; args->self_entry = exec_mem;
args->self_size = vma_len; args->self_size = vma_len;
......
restorer.c
View file @ f63777d2
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
c += 'a' - 10; \ c += 'a' - 10; \
} while (0) } while (0)
#define inline_memcpy(d,s,l) __builtin_memcpy(d,s,l)
#define inline_memset(d,c,l) __builtin_memset(d,c,l)
#define inline_memzero(d,l) __builtin_memset(d,0,l)
#define inline_memzero_p(d) __builtin_memset(d,0,sizeof(*(d)))
#define sigframe_addr(p) ((long)p) #define sigframe_addr(p) ((long)p)
static void always_inline write_char(char c) static void always_inline write_char(char c)
...@@ -299,9 +294,7 @@ self_len_end: ...@@ -299,9 +294,7 @@ self_len_end:
* by the kernel with stack overflow error. * by the kernel with stack overflow error.
*/ */
rt_sigframe = args->rt_sigframe; rt_sigframe = args->rt_sigframe - sizeof(*rt_sigframe);
write_hex_n((long)rt_sigframe);
write_hex_n((long)&rt_sigframe->uc);
#define CPREG1(d) rt_sigframe->uc.uc_mcontext.d = core_entry.u.arch.gpregs.d #define CPREG1(d) rt_sigframe->uc.uc_mcontext.d = core_entry.u.arch.gpregs.d
#define CPREG2(d,s) rt_sigframe->uc.uc_mcontext.d = core_entry.u.arch.gpregs.s #define CPREG2(d,s) rt_sigframe->uc.uc_mcontext.d = core_entry.u.arch.gpregs.s
...@@ -330,10 +323,9 @@ self_len_end: ...@@ -330,10 +323,9 @@ self_len_end:
/* FIXME: What with cr2 and friends which are rest there? */ /* FIXME: What with cr2 and friends which are rest there? */
new_sp = core_entry.u.arch.gpregs.sp - 8; write_hex_n(0x111);
write_hex_n(new_sp); write_hex_n((long)rt_sigframe);
stack = (void *)new_sp; new_sp = (long)rt_sigframe + 8;
*stack = (long)rt_sigframe;
/* /*
* Prepare the stack and call for sigreturn, * Prepare the stack and call for sigreturn,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment