Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dfeaac1 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Herbert Xu
Browse files

crypto: x86/sha256-mb - fix panic due to unaligned access 



struct sha256_ctx_mgr allocated in sha256_mb_mod_init() via kzalloc()
and later passed in sha256_mb_flusher_mgr_flush_avx2() function where
instructions vmovdqa used to access the struct. vmovdqa requires
16-bytes aligned argument, but nothing guarantees that struct
sha256_ctx_mgr will have that alignment. Unaligned vmovdqa will
generate GP fault.

Fix this by replacing vmovdqa with vmovdqu which doesn't have alignment
requirements.

Fixes: a377c6b1 ("crypto: sha256-mb - submit/flush routines for AVX2")
Reported-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Cc: <stable@vger.kernel.org>
Acked-by: Tim Chen
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4635742d

arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S

+6 −6
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ LABEL skip_ %I 
.endr



	# Find min length

	vmovdqa _lens+0*16(state), %xmm0

	vmovdqa _lens+1*16(state), %xmm1

	vmovdqu _lens+0*16(state), %xmm0

	vmovdqu _lens+1*16(state), %xmm1



	vpminud %xmm1, %xmm0, %xmm2		# xmm2 has {D,C,B,A}

	vpalignr $8, %xmm2, %xmm3, %xmm3	# xmm3 has {x,x,D,C}
@@ -176,8 +176,8 @@ LABEL skip_ %I 
	vpsubd	%xmm2, %xmm0, %xmm0

	vpsubd	%xmm2, %xmm1, %xmm1



	vmovdqa	%xmm0, _lens+0*16(state)

	vmovdqa	%xmm1, _lens+1*16(state)

	vmovdqu	%xmm0, _lens+0*16(state)

	vmovdqu	%xmm1, _lens+1*16(state)



	# "state" and "args" are the same address, arg1

	# len is arg2
@@ -234,8 +234,8 @@ ENTRY(sha256_mb_mgr_get_comp_job_avx2) 
	jc	.return_null



	# Find min length

	vmovdqa	_lens(state), %xmm0

	vmovdqa	_lens+1*16(state), %xmm1

	vmovdqu	_lens(state), %xmm0

	vmovdqu	_lens+1*16(state), %xmm1



	vpminud	%xmm1, %xmm0, %xmm2		# xmm2 has {D,C,B,A}

	vpalignr $8, %xmm2, %xmm3, %xmm3	# xmm3 has {x,x,D,C}