mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-03-14 06:16:17 +03:00
remove thread unsafe debug code causing FreeBSD double free panic
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alan Somers <asomers@gmail.com> Signed-off-by: Alek Pinchuk <apinchuk@axcient.com> Closes #18140
This commit is contained in:
parent
28291536bc
commit
cd895f0e57
@ -371,9 +371,6 @@ error:
|
|||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *failed_decrypt_buf;
|
|
||||||
int failed_decrypt_size;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This function handles all encryption and decryption in zfs. When
|
* This function handles all encryption and decryption in zfs. When
|
||||||
* encrypting it expects puio to reference the plaintext and cuio to
|
* encrypting it expects puio to reference the plaintext and cuio to
|
||||||
@ -1665,9 +1662,6 @@ error:
|
|||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *failed_decrypt_buf;
|
|
||||||
int faile_decrypt_size;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Primary encryption / decryption entrypoint for zio data.
|
* Primary encryption / decryption entrypoint for zio data.
|
||||||
*/
|
*/
|
||||||
@ -1760,13 +1754,6 @@ zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key,
|
|||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
error:
|
error:
|
||||||
if (!encrypt) {
|
|
||||||
if (failed_decrypt_buf != NULL)
|
|
||||||
kmem_free(failed_decrypt_buf, failed_decrypt_size);
|
|
||||||
failed_decrypt_buf = kmem_alloc(datalen, KM_SLEEP);
|
|
||||||
failed_decrypt_size = datalen;
|
|
||||||
memcpy(failed_decrypt_buf, cipherbuf, datalen);
|
|
||||||
}
|
|
||||||
if (locked)
|
if (locked)
|
||||||
rw_exit(&key->zk_salt_lock);
|
rw_exit(&key->zk_salt_lock);
|
||||||
if (authbuf != NULL)
|
if (authbuf != NULL)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user