commit c69757a2d57ff3662f101584cfa4c29b3d75a893
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 04 21:59:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 04 21:59:54 2018 +0000
tree b4700a1364822dcdfd9579a7079f979a47c31351
parent 0425a2db079b296329c9f925108a781e43226868
parent f5693c688da161b147de961bc6db0ccc574b8666

Merge "Generalize abort's inline_tgkill, use it in fdsan."

libc/arch-arm64/generic/bionic/__memcpy_chk.S

diff --git a/libc/arch-arm64/generic/bionic/__memcpy_chk.S b/libc/arch-arm64/generic/bionic/__memcpy_chk.S
index 4217775..a6eeca4 100644
--- a/libc/arch-arm64/generic/bionic/__memcpy_chk.S
+++ b/libc/arch-arm64/generic/bionic/__memcpy_chk.S
@@ -30,8 +30,11 @@
 
 ENTRY(__memcpy_chk)
   cmp x2, x3
-  bls memcpy
+  // Direct b.ls memcpy may not have enough range
+  b.hi .L_memcpy_chk_fail
+  b memcpy
 
+.L_memcpy_chk_fail:
   // Preserve for accurate backtrace.
   stp x29, x30, [sp, -16]!
   .cfi_def_cfa_offset 16