From 3ad882658512aa799604914fb0b3962d443f808d Mon Sep 17 00:00:00 2001 From: Jorgen Lundman Date: Thu, 6 Oct 2022 09:07:50 +0900 Subject: [PATCH] Avoid calling rw_destroy() on uninitialized rwlock First the function `memset(&key, 0, ...)` but any call to "goto error;" would call zio_crypt_key_destroy(key) which calls `rw_destroy()`. The `rw_init()` is moved up to be right after the memset. This way the rwlock can be released. The ctx does allocate memory, but that is handled by the memset to 0 and icp skips NULL ptrs. Reviewed-by: Brian Behlendorf Reviewed-by: Richard Yao Signed-off-by: Jorgen Lundman Closes #13976 --- module/os/linux/zfs/zio_crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/os/linux/zfs/zio_crypt.c b/module/os/linux/zfs/zio_crypt.c index ce2c987d7..386088529 100644 --- a/module/os/linux/zfs/zio_crypt.c +++ b/module/os/linux/zfs/zio_crypt.c @@ -249,6 +249,7 @@ zio_crypt_key_init(uint64_t crypt, zio_crypt_key_t *key) #pragma GCC diagnostic pop #endif memset(key, 0, sizeof (zio_crypt_key_t)); + rw_init(&key->zk_salt_lock, NULL, RW_DEFAULT, NULL); /* fill keydata buffers and salt with random data */ ret = random_get_bytes((uint8_t *)&key->zk_guid, sizeof (uint64_t)); @@ -302,7 +303,6 @@ zio_crypt_key_init(uint64_t crypt, zio_crypt_key_t *key) key->zk_crypt = crypt; key->zk_version = ZIO_CRYPT_KEY_CURRENT_VERSION; key->zk_salt_count = 0; - rw_init(&key->zk_salt_lock, NULL, RW_DEFAULT, NULL); return (0);