git: 596030c13dce - releng/15.1 - zvol: Fix uses of uninitialized variables in zvol_rename_minors_impl()
Mark Johnston <[email protected]> Wed, 29 Jul 2026 17:50:28 +0000
| Newsgroups | gmane.os.freebsd.devel.cvs.src |
|---|---|
| Message-ID | <6a6a3d64.3ab65.3e5c7375__25111.8624977366$1785347680$gmane$org@gitrepo.freebsd.org> |
The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=596030c13dce638f3cbaf89b19988f64f677cee5 commit 596030c13dce638f3cbaf89b19988f64f677cee5 Author: Mark Johnston <[email protected]> AuthorDate: 2026-02-12 22:10:36 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2026-07-28 15:16:03 +0000 zvol: Fix uses of uninitialized variables in zvol_rename_minors_impl() Reported-by: GitHub Copilot Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Mark Johnston <[email protected]> Closes #18191 Approved by: so Security: FreeBSD-EN-26:19.zfs (cherry picked from commit 943a05528494b2f4585541089606796476fb229e) (cherry picked from commit 698e0c419895da2d0d12c5f4d61d85a1d91b6b9d) --- sys/contrib/openzfs/module/zfs/zvol.c | 3 +++ 1 file changed, 3 insertions(+) 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;