Merge tag 'v6.15-p6' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit b6ea1680d0ac · 2025-04-29T20:59:42.000-07:00
Pull crypto fix from Herbert Xu:
 "This fixes a regression in scompress"

* tag 'v6.15-p6' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: scompress - increment scomp_scratch_users when already allocated
diff --git a/crypto/scompress.c b/crypto/scompress.c
@@ -163,11 +163,10 @@ static int crypto_scomp_init_tfm(struct crypto_tfm *tfm)
 		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);

Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,10 @@ static int crypto_scomp_init_tfm(struct crypto_tfm *tfm)`
`163`	`163`	`if (ret)`
`164`	`164`	`goto unlock;`
`165`	`165`	`}`
`166`		`- if (!scomp_scratch_users) {`
	`166`	`+ if (!scomp_scratch_users++) {`
`167`	`167`	`ret = crypto_scomp_alloc_scratches();`
`168`	`168`	`if (ret)`
`169`		`- goto unlock;`
`170`		`- scomp_scratch_users++;`
	`169`	`+ scomp_scratch_users--;`
`171`	`170`	`}`
`172`	`171`	`unlock:`
`173`	`172`	`mutex_unlock(&scomp_lock);`