mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 07:03:03 +02:00
This push fixes a regression in scompress.
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmgRjpYACgkQxycdCkmx i6fInxAAnEjHb74rnDASAgL0M+w/cY6ldlPk71v+oeEysdKMInTtSYpS2eGiZM+f WT2ZwsXPiUkNbcw4RM6e7bfmzTkVv8ZKMHINRhu45XToci+cutOddmXlI8D14Jeh jrozvNmgGVAUcmFtulC47kvrlsh7XEucQ8dXefLgDLP2ese6OEk1tvA4DLTXN3XC Cd2b3pH3ah1BDicaYr+zUcY1UTKplULtdE/SVxVreCzvXaSSqq5dy+41Copc4GdT JfHEpWt7ag3uifY0aenS2uvSroDkOEVSbt2mlgf0RMzo4IEiGdjPT99nglfBdW6M 1LeYKddWeEe45OTQRPMvqD5JHfcajh6X1FkAcLu8Ll3mASQKVZkSaaKRrlU+d2hS 914oN9VFClBboPuQPTfJA3TeqVNU2O4gcrFt0PIwydInBkcNPL90VBU4nirTniQ0 soc//wzbrNFN/vqingZQ9Z1X2IZUvLPp62WraeM2mVWzh0y2ME2R6JjTjhwhYxMN Y6AyVMTlnyPIafyol+i1xrOVTUHMIF4LXA8W1I2IqIBf3YSJH88tYOf5rALh50cA TOJrW0Z8o2yZj/XZRkrr8E4x4BEoApJNqEXDWr+gG8EVBrolrGs2qiA7sqxNjCTC +RhOPXsyaLSdGTaCVPvZdg6lm3+VqM1db5+eh4DxNv5evlNDBvk= =/wRC -----END PGP SIGNATURE----- Merge tag 'v6.15-p6' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 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
This commit is contained in:
commit
b6ea1680d0
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user