davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto: x86/sm4 - Fix invalid section entry size

Browse Source 
This fixes the following warning:

  vmlinux.o: warning: objtool: elf_update: invalid section entry size

The size of the rodata section is 164 bytes, directly using the
entry_size of 164 bytes will cause errors in some versions of the
gcc compiler, while using 16 bytes directly will cause errors in
the clang compiler. This patch correct it by filling the size of
rodata to a 16-byte boundary.

Fixes: a7ee22ee14 ("crypto: x86/sm4 - add AES-NI/AVX/x86_64 implementation")
Fixes: 5b2efa2bb8 ("crypto: x86/sm4 - add AES-NI/AVX2/x86_64 implementation")
Reported-by: Peter Zijlstra <peterz@infradead.org>
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Tested-by: Heyuan Shi <heyuan@linux.alibaba.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tianjia Zhang 2021-10-15 11:47:33 +08:00 committed by Herbert Xu
parent 0e14ef3866
commit f8690a4b5a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/crypto/sm4-aesni-avx-asm_64.S
View File

@ -78,7 +78,7 @@
vpxor tmp0, x, x; vpxor tmp0, x, x;
.section .rodata.cst164, "aM", @progbits, 164 .section .rodata.cst16, "aM", @progbits, 16
.align 16 .align 16
/* /*
@ -133,6 +133,10 @@
.L0f0f0f0f: .L0f0f0f0f:
.long 0x0f0f0f0f .long 0x0f0f0f0f
/* 12 bytes, only for padding */
.Lpadding_deadbeef:
.long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef
.text .text
.align 16 .align 16

6
arch/x86/crypto/sm4-aesni-avx2-asm_64.S
View File

@ -93,7 +93,7 @@
vpxor tmp0, x, x; vpxor tmp0, x, x;
.section .rodata.cst164, "aM", @progbits, 164 .section .rodata.cst16, "aM", @progbits, 16
.align 16 .align 16
/* /*
@ -148,6 +148,10 @@
.L0f0f0f0f: .L0f0f0f0f:
.long 0x0f0f0f0f .long 0x0f0f0f0f
/* 12 bytes, only for padding */
.Lpadding_deadbeef:
.long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef
.text .text
.align 16 .align 16