RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:07:45 +00:00
Code Issues Activity Actions

LibC: Fix sigsetjmp on i686

Browse source 
Calling sigprocmask() through the PLT requires setting the ebx register
to the address of the global offset table, otherwise chaos ensues. Also
the value of the ecx register was assumed to be preserved across that
function call despite the fact that it is caller-saved in the x86
calling convention.
This commit is contained in:
Jean-Baptiste Boric 2021-08-24 20:24:08 +02:00 • committed by Andreas Kling
parent 04694ae682
commit c87aa6d908
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibC/arch/i386/setjmp.S
View file

@ -10,31 +10,43 @@
// /!\ Read setjmp.h before modifying this file! // /!\ Read setjmp.h before modifying this file!
// //
.Lget_pc:
mov (%esp), %ebx
ret
.global setjmp .global setjmp
setjmp: setjmp:
mov 4(%esp), %ecx // Grab jmp_buf argument
xor %eax, %eax // Grab val argument (hardcoded to zero) xor %eax, %eax // Grab val argument (hardcoded to zero)
jmp .Lsigset_common jmp .Lsigset_common
.global sigsetjmp .global sigsetjmp
sigsetjmp: sigsetjmp:
mov 4(%esp), %ecx // Grab jmp_buf argument
mov 8(%esp), %eax // Grab val argument mov 8(%esp), %eax // Grab val argument
.Lsigset_common: .Lsigset_common:
mov 4(%esp), %ecx // Grab jmp_buf argument
mov %eax, 24(%ecx) // Store val into did_save_signal_mask mov %eax, 24(%ecx) // Store val into did_save_signal_mask
movl $0, 28(%ecx) // Clear saved_signal_mask movl $0, 28(%ecx) // Clear saved_signal_mask
test %eax, %eax test %eax, %eax
jz .Lsaveregs jz .Lsaveregs
push %ebp // Prepare ABI-compliant call to sigprocmask
mov %esp, %ebp
push %ebx
call .Lget_pc // Grab the GOT pointer
addl $_GLOBAL_OFFSET_TABLE_, %ebx
lea 28(%ecx), %eax // Set argument oldset lea 28(%ecx), %eax // Set argument oldset
push %eax push %eax
push $0 // Set argument set push $0 // Set argument set
push $0 // Set argument how push $0 // Set argument how
call sigprocmask@plt call sigprocmask@plt
add $12, %esp add $12, %esp
pop %ebx
pop %ebp
.Lsaveregs: .Lsaveregs:
mov 4(%esp), %ecx // Grab jmp_buf argument
mov (%esp), %edx // Grab return address mov (%esp), %edx // Grab return address
mov %ebx, (0 * 4)(%ecx) // Save registers mov %ebx, (0 * 4)(%ecx) // Save registers
mov %esi, (1 * 4)(%ecx) mov %esi, (1 * 4)(%ecx)