Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix ida leak in zvol_create_minor_impl 

Added missing ida_simple_remove() in the error handling path.

Reviewed-by: Chunwei Chen <david.chen@osnexus.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Boris Protopopov <boris.protopopov@actifio.com>
Closes #6159 
Closes #6172
This commit is contained in:
Boris Protopopov 2017-05-26 20:50:25 -04:00 committed by Brian Behlendorf
parent 9210e43a16
commit 2d82116e80
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/zfs/zvol.c
View File

@ -1164,6 +1164,12 @@ zvol_resume(zvol_state_t *zv)
int error = 0; int error = 0;
ASSERT(RW_WRITE_HELD(&zv->zv_suspend_lock)); ASSERT(RW_WRITE_HELD(&zv->zv_suspend_lock));
/*
* Cannot take zv_state_lock here with zv_suspend_lock
* held; however, the latter is held in exclusive mode,
* so it is not necessary to do so
*/
if (zv->zv_open_count > 0) { if (zv->zv_open_count > 0) {
VERIFY0(dmu_objset_hold(zv->zv_name, zv, &zv->zv_objset)); VERIFY0(dmu_objset_hold(zv->zv_name, zv, &zv->zv_objset));
VERIFY3P(zv->zv_objset->os_dsl_dataset->ds_owner, ==, zv); VERIFY3P(zv->zv_objset->os_dsl_dataset->ds_owner, ==, zv);
@ -1620,6 +1626,7 @@ zvol_create_minor_impl(const char *name)
zv = zvol_find_by_name_hash(name, hash); zv = zvol_find_by_name_hash(name, hash);
if (zv) { if (zv) {
mutex_exit(&zvol_state_lock); mutex_exit(&zvol_state_lock);
ida_simple_remove(&zvol_ida, idx);
return (SET_ERROR(EEXIST)); return (SET_ERROR(EEXIST));
} }