Skip to contentSkip to conversation

crypto: arm64/aes-neonbs - don't access already-freed walk.iv

PATCH In review Eric Biggers 2 participants 2 messages May 17, 2019 – May 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: arm64/aes-neonbs - don't access already-freed walk.iv

From: Eric Biggers <[email protected]>

commit 4a8108b70508df0b6c4ffa4a3974dab93dcbe851 upstream. [Please apply to 4.14-stable.]

If the user-provided IV needs to be aligned to the algorithm's alignmask, then skcipher_walk_virt() copies the IV into a new aligned buffer walk.iv. But skcipher_walk_virt() can fail afterwards, and then if the caller unconditionally accesses walk.iv, it's a use-after-free.

xts-aes-neonbs doesn't set an alignmask, so currently it isn't affected by this despite unconditionally accessing walk.iv. However this is more subtle than desired, and unconditionally accessing walk.iv has caused a real problem in other algorithms. Thus, update xts-aes-neonbs to start checking the return value of skcipher_walk_virt().

Fixes 1abee99eafab ("crypto: arm64/aes - reimplement bit-sliced ARM/NEON implementation for arm64")
Cc <[email protected]> # v4.11+
---
 arch/arm64/crypto/aes-neonbs-glue.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/crypto/aes-neonbs-glue.c +2 -0
index c55d68ccb89f8..52975817fdb66 100644
@@ -307,6 +307,8 @@ static int __xts_crypt(struct skcipher_request *req,
 	int err;
 
 	err = skcipher_walk_virt(&walk, req, true);
+	if (err)
+		return err;
 
 	kernel_neon_begin();
 
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
#1 lore raw
Quoted 4 lines · Eric Biggers

From: Eric Biggers <[email protected]>

commit 4a8108b70508df0b6c4ffa4a3974dab93dcbe851 upstream. [Please apply to 4.14-stable.]

Now applied, thanks.

greg k-h