提交 19320cda 编写于 作者: F Fangrui Song 提交者: Yang Yingliang

arm64: Change .weak to SYM_FUNC_START_WEAK_PI for arch/arm64/lib/mem*.S

stable inclusion
from linux-4.19.164
commit 13ed97c2bb939890fe0814d6952189dfec57797f

--------------------------------

commit ec9d7807 upstream.

Commit 39d114dd ("arm64: add KASAN support") added .weak directives to
arch/arm64/lib/mem*.S instead of changing the existing SYM_FUNC_START_PI
macros. This can lead to the assembly snippet `.weak memcpy ... .globl
memcpy` which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL
memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol
binding.

Use the appropriate SYM_FUNC_START_WEAK_PI instead.

Fixes: 39d114dd ("arm64: add KASAN support")
Reported-by: NSami Tolvanen <samitolvanen@google.com>
Signed-off-by: NFangrui Song <maskray@google.com>
Tested-by: NSami Tolvanen <samitolvanen@google.com>
Tested-by: NNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: NNick Desaulniers <ndesaulniers@google.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201029181951.1866093-1-maskray@google.comSigned-off-by: NWill Deacon <will@kernel.org>
[nd: backport to adjust for missing:
  commit 3ac0f452 ("arm64: lib: Use modern annotations for assembly functions")
  commit 35e61c77 ("arm64: asm: Add new-style position independent function annotations")]
Signed-off-by: NNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NCheng Jian <cj.chengjian@huawei.com>
上级 7918e199
...@@ -68,9 +68,8 @@ ...@@ -68,9 +68,8 @@
stp \ptr, \regB, [\regC], \val stp \ptr, \regB, [\regC], \val
.endm .endm
.weak memcpy
ENTRY(__memcpy) ENTRY(__memcpy)
ENTRY(memcpy) WEAK(memcpy)
#include "copy_template.S" #include "copy_template.S"
ret ret
ENDPIPROC(memcpy) ENDPIPROC(memcpy)
......
...@@ -57,9 +57,8 @@ C_h .req x12 ...@@ -57,9 +57,8 @@ C_h .req x12
D_l .req x13 D_l .req x13
D_h .req x14 D_h .req x14
.weak memmove
ENTRY(__memmove) ENTRY(__memmove)
ENTRY(memmove) WEAK(memmove)
cmp dstin, src cmp dstin, src
b.lo __memcpy b.lo __memcpy
add tmp1, src, count add tmp1, src, count
......
...@@ -54,9 +54,8 @@ dst .req x8 ...@@ -54,9 +54,8 @@ dst .req x8
tmp3w .req w9 tmp3w .req w9
tmp3 .req x9 tmp3 .req x9
.weak memset
ENTRY(__memset) ENTRY(__memset)
ENTRY(memset) WEAK(memset)
mov dst, dstin /* Preserve return value. */ mov dst, dstin /* Preserve return value. */
and A_lw, val, #255 and A_lw, val, #255
orr A_lw, A_lw, A_lw, lsl #8 orr A_lw, A_lw, A_lw, lsl #8
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册