diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2025-04-25 10:37:30 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2025-04-25 10:37:30 +0800 |
| commit | 3715cb9863ced462fc1bcc3e1a8444db4b16927c (patch) | |
| tree | 4cfbb89323d79d5fdbe415f3b99c406a97d7e4ad | |
| parent | 63dc06cd12f980e304158888485a26ae2be7f371 (diff) | |
| parent | a32f1923c6d6e9e727d00558a15ec0af6639de19 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up the scompress scratch refcount fix. The
merge resolution is slightly non-trivial as the context has shifted.
| -rw-r--r-- | crypto/scompress.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/scompress.c b/crypto/scompress.c index 8db4613150e0..15148c58d648 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -128,11 +128,10 @@ static int crypto_scomp_init_tfm(struct crypto_tfm *tfm) ret = crypto_acomp_alloc_streams(&alg->streams); if (ret) goto unlock; - if (!scomp_scratch_users) { + if (!scomp_scratch_users++) { ret = crypto_scomp_alloc_scratches(); if (ret) - goto unlock; - scomp_scratch_users++; + scomp_scratch_users--; } unlock: mutex_unlock(&scomp_lock); |