Messages in this thread | | | Date | Fri, 24 Sep 2021 16:07:25 +0800 | From | Herbert Xu <> | Subject | Re: [PATCH] x86/crypto/sm4: Fix frame pointer stack corruption |
| |
On Tue, Sep 21, 2021 at 10:40:26PM -0700, Josh Poimboeuf wrote: > sm4_aesni_avx_crypt8() sets up the frame pointer (which includes pushing > RBP) before doing a conditional sibling call to sm4_aesni_avx_crypt4(), > which sets up an additional frame pointer. Things will not go well when > sm4_aesni_avx_crypt4() pops only the innermost single frame pointer and > then tries to return to the outermost frame pointer. > > Sibling calls need to occur with an empty stack frame. Do the > conditional sibling call *before* setting up the stack pointer. > > This fixes the following warning: > > arch/x86/crypto/sm4-aesni-avx-asm_64.o: warning: objtool: sm4_aesni_avx_crypt8()+0x8: sibling call from callable instruction with modified stack frame > > Fixes: a7ee22ee1445 ("crypto: x86/sm4 - add AES-NI/AVX/x86_64 implementation") > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Arnd Bergmann <arnd@kernel.org> > Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> > Reviewed-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> > --- > arch/x86/crypto/sm4-aesni-avx-asm_64.S | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-)
Patch applied. Thanks. -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
| |