Skip to content

Commit

Permalink
crypto: salsa20 - don't access already-freed walk.iv
Browse files Browse the repository at this point in the history
commit edaf28e upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
ebiggers authored and gregkh committed May 22, 2019
1 parent 7a32ad3 commit 3b5ddd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/salsa20_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int salsa20_crypt(struct skcipher_request *req)

err = skcipher_walk_virt(&walk, req, true);

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

while (walk.nbytes > 0) {
unsigned int nbytes = walk.nbytes;
Expand Down

0 comments on commit 3b5ddd5

Please sign in to comment.