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
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: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
ebiggers authored and herbertx committed Apr 18, 2019
1 parent aec286c commit edaf28e
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 @@ -160,7 +160,7 @@ static int salsa20_crypt(struct skcipher_request *req)

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

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 edaf28e

Please sign in to comment.