]> git.baikalelectronics.ru Git - kernel.git/commit
crypto: salsa20 - don't access already-freed walk.iv
authorEric Biggers <ebiggers@google.com>
Wed, 10 Apr 2019 06:46:30 +0000 (23:46 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 18 Apr 2019 14:14:58 +0000 (22:14 +0800)
commit134db1e97b05bca030bcac72ed184b8d7a747883
tree29bb259e0d67981a052a486930977d0f43f9647d
parentd5c507b84fa37b593d8f1d74265b860cb1dae3ba
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 428baeb4ed19 ("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: 570ab45bf595 ("[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>
crypto/salsa20_generic.c