diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-04-01 13:12:09 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-04-01 13:12:09 +0200 |
| commit | 831fd9fdce82ad6727c15552b430c5e54420d92f (patch) | |
| tree | 92cc49cb728ae789fcf1306a4a36206cd0f7a098 /crypto/aead.c | |
| parent | fa52b9919271e59a73b989df5c92bbf0bb983c3d (diff) | |
| parent | 1d5d6bd2502dff39b91d2280711ecbf86c1287a8 (diff) | |
| download | linux-crypto-831fd9fdce82ad6727c15552b430c5e54420d92f.tar.gz linux-crypto-831fd9fdce82ad6727c15552b430c5e54420d92f.zip | |
Merge tag 'v5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.1-rc3
Sync with upstream (which now contains fbdev-v5.1 changes) to
prepare a base for fbdev-v5.2 changes.
Diffstat (limited to 'crypto/aead.c')
| -rw-r--r-- | crypto/aead.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 189c52d1..4908b5e8 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -61,8 +61,10 @@ int crypto_aead_setkey(struct crypto_aead *tfm, else err = crypto_aead_alg(tfm)->setkey(tfm, key, keylen); - if (err) + if (unlikely(err)) { + crypto_aead_set_flags(tfm, CRYPTO_TFM_NEED_KEY); return err; + } crypto_aead_clear_flags(tfm, CRYPTO_TFM_NEED_KEY); return 0; |