From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 25 Apr 2025 02:37:30 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3715cb9863ced462fc1bcc3e1a8444db4b16927c;p=users%2Fjedix%2Flinux-maple.git

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.
---

3715cb9863ced462fc1bcc3e1a8444db4b16927c
diff --cc crypto/scompress.c
index 8db4613150e05,ffeedcf20b0f1..15148c58d6485
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@@ -125,14 -158,15 +125,13 @@@ static int crypto_scomp_init_tfm(struc
  	int ret = 0;
  
  	mutex_lock(&scomp_lock);
 -	if (!alg->stream) {
 -		ret = scomp_alloc_streams(alg);
 -		if (ret)
 -			goto unlock;
 -	}
 +	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);