diff mbox series

libsanitizer: cherry-pick commit 742bcbf685bc from upstream

Message ID 20230131223954.219780-1-hjl.tools@gmail.com
State New
Headers show
Series libsanitizer: cherry-pick commit 742bcbf685bc from upstream | expand

Commit Message

H.J. Lu Jan. 31, 2023, 10:39 p.m. UTC 
cherry-pick:

742bcbf685bc compiler-rt/lib: Add .Linterceptor_sigsetjmp

	PR sanitizer/108106
	* hwasan/hwasan_setjmp_x86_64.S (__interceptor_setjmp): Jump
	to .Linterceptor_sigsetjmp instead of __interceptor_sigsetjmp.
	(__interceptor_sigsetjmp): Add a local alias,
	.Linterceptor_sigsetjmp.
---
 libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jakub Jelinek Jan. 31, 2023, 10:53 p.m. UTC | #1 
On Tue, Jan 31, 2023 at 02:39:54PM -0800, H.J. Lu wrote:
> cherry-pick:
> 
> 742bcbf685bc compiler-rt/lib: Add .Linterceptor_sigsetjmp
> 
> 	PR sanitizer/108106
> 	* hwasan/hwasan_setjmp_x86_64.S (__interceptor_setjmp): Jump
> 	to .Linterceptor_sigsetjmp instead of __interceptor_sigsetjmp.
> 	(__interceptor_sigsetjmp): Add a local alias,
> 	.Linterceptor_sigsetjmp.

LGTM, thanks.

	Jakub
diff mbox series

Patch

diff --git a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S
index 7566c1ea0a5..a5a3858d94d 100644
--- a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S
+++ b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S
@@ -37,13 +37,14 @@  __interceptor_setjmp:
   CFI_STARTPROC
   _CET_ENDBR
   xorl %esi, %esi
-  jmp	__interceptor_sigsetjmp
+  jmp	.Linterceptor_sigsetjmp
   CFI_ENDPROC
 ASM_SIZE(__interceptor_setjmp)
 
 .global __interceptor_sigsetjmp
 ASM_TYPE_FUNCTION(__interceptor_sigsetjmp)
 __interceptor_sigsetjmp:
+.Linterceptor_sigsetjmp:
   CFI_STARTPROC
   _CET_ENDBR