diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-17 15:32:30 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-06 18:59:40 -0700 |
| commit | 9eb088e57edd9aa38e7d7a6c86424b4e6d5400eb (patch) | |
| tree | c1671c4fbfeb0a9da598ebe3285b0d2c559b2c7b /crypto | |
| parent | 7d2a354861e9257824a201d39a11e6a4d2a60cb4 (diff) | |
| download | linux-stable-9eb088e57edd9aa38e7d7a6c86424b4e6d5400eb.tar.gz linux-stable-9eb088e57edd9aa38e7d7a6c86424b4e6d5400eb.tar.bz2 linux-stable-9eb088e57edd9aa38e7d7a6c86424b4e6d5400eb.zip | |
crypto: authencesn - Fix digest_null crash
commit 41cdf7a45389e01991ee31e3301ed83cb3e3f7dc upstream.
When authencesn is used together with digest_null a crash will
occur on the decrypt path. This is because normally we perform
a special setup to preserve the ESN, but this is skipped if there
is no authentication. However, on the post-authentication path
it always expects the preservation to be in place, thus causing
a crash when digest_null is used.
This patch fixes this by also skipping the post-processing when
there is no authentication.
Fixes: 104880a6b470 ("crypto: authencesn - Convert to new AEAD...")
Reported-by: Jan Tluka <jtluka@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/authencesn.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/authencesn.c b/crypto/authencesn.c index 121010ac9962..18c94e1c31d1 100644 --- a/crypto/authencesn.c +++ b/crypto/authencesn.c @@ -248,6 +248,9 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req, u8 *ihash = ohash + crypto_ahash_digestsize(auth); u32 tmp[2]; + if (!authsize) + goto decrypt; + /* Move high-order bits of sequence number back. */ scatterwalk_map_and_copy(tmp, dst, 4, 4, 0); scatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 0); @@ -256,6 +259,8 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req, if (crypto_memneq(ihash, ohash, authsize)) return -EBADMSG; +decrypt: + sg_init_table(areq_ctx->dst, 2); dst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen); |