aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2026-02-12 22:10:36 +0000
committerMark Johnston <markj@FreeBSD.org>2026-07-28 15:16:03 +0000
commit596030c13dce638f3cbaf89b19988f64f677cee5 (patch)
tree9da8b49fc5e99044982390a58346983984b2aea9
parent42ae0454bfb2a7d3d8364c1bb31b518ec9833b6d (diff)
zvol: Fix uses of uninitialized variables in zvol_rename_minors_impl()
Reported-by: GitHub Copilot Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes #18191 Approved by: so Security: FreeBSD-EN-26:19.zfs (cherry picked from commit 943a05528494b2f4585541089606796476fb229e) (cherry picked from commit 698e0c419895da2d0d12c5f4d61d85a1d91b6b9d)
-rw-r--r--sys/contrib/openzfs/module/zfs/zvol.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/module/zfs/zvol.c b/sys/contrib/openzfs/module/zfs/zvol.c
index b35817f5c830..12f87c870eac 100644
--- a/sys/contrib/openzfs/module/zfs/zvol.c
+++ b/sys/contrib/openzfs/module/zfs/zvol.c
@@ -1762,6 +1762,7 @@ zvol_rename_minors_impl(zvol_task_t *task)
if (zvol_inhibit_dev)
return;
+ last_error = 0;
oldnamelen = strlen(oldname);
rw_enter(&zvol_state_lock, RW_WRITER);
@@ -1781,6 +1782,8 @@ zvol_rename_minors_impl(zvol_task_t *task)
zv->zv_name + oldnamelen + 1);
error = zvol_os_rename_minor(zv, name);
kmem_strfree(name);
+ } else {
+ error = 0;
}
if (error) {
last_error = error;