Skip to content

remove thread unsafe debug code causing FreeBSD double free panic #18140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behlendorf merged 1 commit into from
Jan 21, 2026
Merged

remove thread unsafe debug code causing FreeBSD double free panic #18140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions module/os/freebsd/zfs/zio_crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,6 @@ zio_crypt_key_get_salt(zio_crypt_key_t *key, uint8_t *salt)
return (ret);
}

void *failed_decrypt_buf;
int failed_decrypt_size;

/*
* This function handles all encryption and decryption in zfs. When
* encrypting it expects puio to reference the plaintext and cuio to
Expand Down Expand Up @@ -1665,9 +1662,6 @@ zio_crypt_init_uios(boolean_t encrypt, uint64_t version, dmu_object_type_t ot,
return (ret);
}

void *failed_decrypt_buf;
int faile_decrypt_size;

/*
* Primary encryption / decryption entrypoint for zio data.
*/
Expand Down Expand Up @@ -1760,13 +1754,6 @@ zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key,
return (0);

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)
rw_exit(&key->zk_salt_lock);
if (authbuf != NULL)
Expand Down
Loading