Skip to content

Commit edaf28e

Browse files
ebiggersherbertx
authored andcommitted
crypto: salsa20 - don't access already-freed walk.iv
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. salsa20-generic 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 it was actually broken prior to the alignmask being removed by commit b62b3db ("crypto: salsa20-generic - cleanup and convert to skcipher API"). Since salsa20-generic does not update the IV and does not need any IV alignment, update it to use req->iv instead of walk.iv. Fixes: 2407d60 ("[CRYPTO] salsa20: Salsa20 stream cipher") Cc: [email protected] Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent aec286c commit edaf28e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crypto/salsa20_generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static int salsa20_crypt(struct skcipher_request *req)
160160

161161
err = skcipher_walk_virt(&walk, req, false);
162162

163-
salsa20_init(state, ctx, walk.iv);
163+
salsa20_init(state, ctx, req->iv);
164164

165165
while (walk.nbytes > 0) {
166166
unsigned int nbytes = walk.nbytes;

0 commit comments

Comments
 (0)