diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 21:35:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 21:35:46 +0100 |
| commit | 66f4beaa6c1d28161f534471484b2daa2de1dce0 (patch) | |
| tree | ae7826e7f322b1be3cb6efdf4db938b30aedeffd /crypto | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | crypto: api - Fix boot-up crash when crypto manager is disabled (diff) | |
| download | linux-66f4beaa6c1d28161f534471484b2daa2de1dce0.tar.xz linux-66f4beaa6c1d28161f534471484b2daa2de1dce0.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a boot crash regression"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Fix boot-up crash when crypto manager is disabled
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algapi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index d379fd91fb7b..a366cb3e8aa1 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -284,6 +284,8 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) if (larval) list_add(&larval->alg.cra_list, &crypto_alg_list); + else + alg->cra_flags |= CRYPTO_ALG_TESTED; crypto_stats_init(alg); |