[PATCH 1/2] LoongArch: Fix LD_AUDIT in _dl_runtime_profile
dengjianbo
dengjianbo@loongson.cn
Thu Nov 19 11:54:58 GMT 2026
On 11/19/26 6:06 PM, Gabriel Ravier wrote:
> On 11/17/26 12:00 PM, Deng Jianbo wrote:
>> When an audit module requests additional stack space by returning a
>> positive framesizep from la_loongarch_gnu_pltenter, _dl_runtime_profile
>> crashes for the following reasons:
>> * Return values are stored starting at OFFSET_SAVED_CALL_A0 instead of
>> OFFSET_RV, overwriting the saved link_map argument later passed to
>> _dl_audit_pltexit and causing invalid memory accesses.
>> * The caller return address is not saved in lr_ra, so the frame-growth
>> path returns through an uninitialized address.
>> * The saved frame pointer is stored over itself with REG_S instead of
>> being restored with REG_L.
>>
>> Store return values at the correct La_loongarch_retval offsets so they
>> do not overwrite the saved link_map and relocation-index arguments
>> passed to _dl_audit_pltexit. Save lr_sp and lr_ra in La_loongarch_regs
>> before invoking the audit callbacks, and restore fp with REG_L. Because
>> La_loongarch_vector is a 32-byte slot in LASX, LSX, and scalar
>> floating-point modes, use a 32-byte stride when storing or loading LSX
>> and scalar floating-point registers.
>> ---
>> sysdeps/loongarch/Makefile | 14 ++
>> sysdeps/loongarch/dl-trampoline.h | 133 +++++------
>> sysdeps/loongarch/tst-audit29.c | 155 +++++++++++++
>> sysdeps/loongarch/tst-audit29mod.c | 198 ++++++++++++++++
>> sysdeps/loongarch/tst-audit29mod.h | 162 +++++++++++++
>> sysdeps/loongarch/tst-auditmod29.c | 352 +++++++++++++++++++++++++++++
>> 6 files changed, 951 insertions(+), 63 deletions(-)
>> create mode 100644 sysdeps/loongarch/tst-audit29.c
>> create mode 100644 sysdeps/loongarch/tst-audit29mod.c
>> create mode 100644 sysdeps/loongarch/tst-audit29mod.h
>> create mode 100644 sysdeps/loongarch/tst-auditmod29.c
>>
>> [...]
>>
>> diff --git a/sysdeps/loongarch/dl-trampoline.h
>> b/sysdeps/loongarch/dl-trampoline.h
>> index 578ed8600a..9285a7e646 100644
>> --- a/sysdeps/loongarch/dl-trampoline.h
>> +++ b/sysdeps/loongarch/dl-trampoline.h
>> @@ -183,25 +183,32 @@ ENTRY (_dl_runtime_profile)
>> xvst xr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> xvst xr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif defined USE_LSX
>> - vst vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZVREG
>> - vst vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZVREG
>> - vst vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZVREG
>> - vst vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZVREG
>> - vst vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZVREG
>> - vst vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZVREG
>> - vst vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZVREG
>> - vst vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZVREG
>> + /* A La_loongarch_vector slot is 32 bytes even in LSX mode, so
>> advance
>> + one full slot for each vector register. */
>> + vst vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + vst vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + vst vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + vst vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + vst vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + vst vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + vst vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + vst vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif !defined __loongarch_soft_float
>> - FREG_S fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZFREG
>> - FREG_S fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZFREG
>> - FREG_S fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZFREG
>> - FREG_S fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZFREG
>> - FREG_S fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZFREG
>> - FREG_S fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZFREG
>> - FREG_S fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZFREG
>> - FREG_S fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZFREG
>> + FREG_S fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + FREG_S fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + FREG_S fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + FREG_S fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + FREG_S fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + FREG_S fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + FREG_S fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + FREG_S fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #endif
>> + /* Record the caller's stack pointer and return address for
>> audit. */
>> + ADDI a0, sp, SF_SIZE
>> + REG_S a0, fp, OFFSET_RG + DL_OFFSET_RG_SP
>> + REG_S ra, fp, OFFSET_RG + DL_OFFSET_RG_RA
>> +
>> /* Update .got.plt and obtain runtime address of callee. */
>> SLLI a1, t1, 1
>> or a0, t0, zero
>> @@ -242,23 +249,23 @@ ENTRY (_dl_runtime_profile)
>> xvld xr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> xvld xr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif defined USE_LSX
>> - vld vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZVREG
>> - vld vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZVREG
>> - vld vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZVREG
>> - vld vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZVREG
>> - vld vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZVREG
>> - vld vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZVREG
>> - vld vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZVREG
>> - vld vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZVREG
>> + vld vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + vld vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + vld vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + vld vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + vld vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + vld vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + vld vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + vld vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif !defined __loongarch_soft_float
>> - FREG_L fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZFREG
>> - FREG_L fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZFREG
>> - FREG_L fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZFREG
>> - FREG_L fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZFREG
>> - FREG_L fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZFREG
>> - FREG_L fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZFREG
>> - FREG_L fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZFREG
>> - FREG_L fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZFREG
>> + FREG_L fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + FREG_L fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + FREG_L fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + FREG_L fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + FREG_L fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + FREG_L fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + FREG_L fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + FREG_L fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #endif
>> REG_L ra, fp, 0
>> @@ -302,39 +309,39 @@ ENTRY (_dl_runtime_profile)
>> xvld xr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> xvld xr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif defined USE_LSX
>> - vld vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZVREG
>> - vld vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZVREG
>> - vld vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZVREG
>> - vld vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZVREG
>> - vld vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZVREG
>> - vld vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZVREG
>> - vld vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZVREG
>> - vld vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZVREG
>> + vld vr0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + vld vr1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + vld vr2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + vld vr3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + vld vr4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + vld vr5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + vld vr6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + vld vr7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #elif !defined __loongarch_soft_float
>> - FREG_L fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZFREG
>> - FREG_L fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZFREG
>> - FREG_L fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZFREG
>> - FREG_L fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZFREG
>> - FREG_L fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZFREG
>> - FREG_L fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZFREG
>> - FREG_L fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZFREG
>> - FREG_L fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZFREG
>> + FREG_L fa0, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 0*SZXREG
>> + FREG_L fa1, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 1*SZXREG
>> + FREG_L fa2, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 2*SZXREG
>> + FREG_L fa3, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 3*SZXREG
>> + FREG_L fa4, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 4*SZXREG
>> + FREG_L fa5, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 5*SZXREG
>> + FREG_L fa6, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 6*SZXREG
>> + FREG_L fa7, fp, OFFSET_RG + DL_OFFSET_RG_VEC0 + 7*SZXREG
>> #endif
>> jirl ra, t6, 0
>> - REG_S a0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_A0
>> - REG_S a1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_A0 + SZREG
>> + REG_S a0, fp, OFFSET_RV + DL_OFFSET_RV_A0
>> + REG_S a1, fp, OFFSET_RV + DL_OFFSET_RV_A0 + SZREG
>> #ifdef USE_LASX
>> - xvst xr0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - xvst xr1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZXREG
>> + xvst xr0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + xvst xr1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #elif defined USE_LSX
>> - vst vr0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - vst vr1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZVREG
>> + vst vr0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + vst vr1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #elif !defined __loongarch_soft_float
>> - FREG_S fa0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - FREG_S fa1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZFREG
>> + FREG_S fa0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + FREG_S fa1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #endif
>> /* Setup call to pltexit. */
>> @@ -349,21 +356,21 @@ ENTRY (_dl_runtime_profile)
>> REG_L a1, fp, OFFSET_RV + DL_OFFSET_RV_A0 + SZREG
>> #ifdef USE_LASX
>> - xvld xr0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - xvld xr1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZXREG
>> + xvld xr0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + xvld xr1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #elif defined USE_LSX
>> - vld vr0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - vld vr1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZVREG
>> + vld vr0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + vld vr1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #elif !defined __loongarch_soft_float
>> - FREG_L fa0, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0
>> - FREG_L fa1, fp, OFFSET_SAVED_CALL_A0 + DL_OFFSET_RV_VEC0 + SZFREG
>> + FREG_L fa0, fp, OFFSET_RV + DL_OFFSET_RV_VEC0
>> + FREG_L fa1, fp, OFFSET_RV + DL_OFFSET_RV_VEC0 + SZXREG
>> #endif
>> /* RA from within La_loongarch_reg. */
>> REG_L ra, fp, OFFSET_RG + DL_OFFSET_RG_RA
>> or sp, fp, zero
>> ADDI sp, sp, SF_SIZE
>
> What happens if a signal arrives right at this precise point? It was my
> understanding loongarch has no redzone; would it not then thus clobber
> the saved fp loaded in the next instruction?
>
>> - REG_S fp, fp, SZREG
>> + REG_L fp, fp, SZREG
>> jirl zero, ra, 0
>> [...]
>
Thanks for your review. Yes, restoring sp first may cause the signal
delivery to clobber the saved fp value. I will change the order to
restore fp before sp and send a new patch.
More information about the Libc-alpha
mailing list