diff options
| author | martin <martin@NetBSD.org> | 2022-06-06 11:31:13 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2022-06-06 11:31:13 +0000 |
| commit | 0fdbfe88ca6cee12bea0270bdc768c10718d3403 (patch) | |
| tree | a2dc7c6bb11252b99a7e3564bd9794742d00aacc | |
| parent | d9621be8192e0b0d508c05f767f4849542f56520 (diff) | |
Pull up following revision(s) (requested by skrll in ticket #1464):
lib/libc/arch/hppa/sys/ptrace.S: revision 1.8
Save and restore %r19 the "linkage table pointer register" across the call
to __cerror so if the ptrace syscall fails we can call __cerror again with
the correct %r19 value.
Do this even though the call of __cerror doesn't go via the PLT because
__cerror calls __errno which does.
Analysis and fix from Tom Lane in
PR port-hppa/56864: hppa: ptrace(2) dumps core when returning an error
I changed the location of where %r19 is stored on the stack to follow the
ABI.
| -rw-r--r-- | lib/libc/arch/hppa/sys/ptrace.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libc/arch/hppa/sys/ptrace.S b/lib/libc/arch/hppa/sys/ptrace.S index 62352599323..538e1722499 100644 --- a/lib/libc/arch/hppa/sys/ptrace.S +++ b/lib/libc/arch/hppa/sys/ptrace.S @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.S,v 1.6 2008/04/28 20:22:56 martin Exp $ */ +/* $NetBSD: ptrace.S,v 1.6.66.1 2022/06/06 11:31:13 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -44,10 +44,12 @@ ENTRY(ptrace, HPPA_FRAME_SIZE) stw %arg1, HPPA_FRAME_ARG(1)(%sp) stw %arg2, HPPA_FRAME_ARG(2)(%sp) stw %arg3, HPPA_FRAME_ARG(3)(%sp) + stw %r19, HPPA_FRAME_EDP(%sp) ldo HPPA_FRAME_SIZE(%sp),%sp bl __cerror, %rp copy %r0, %t1 ldo -HPPA_FRAME_SIZE(%sp), %sp + ldw HPPA_FRAME_EDP(%sp), %r19 ldw HPPA_FRAME_ARG(0)(%sp), %arg0 ldw HPPA_FRAME_ARG(1)(%sp), %arg1 ldw HPPA_FRAME_ARG(2)(%sp), %arg2 |
