c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix zfs_sb_teardown/zfs_resume_fs NULL dereference

Browse Source 
Fix a pair of conditions in which a concurrent umount can cause
NULL pointer dereferences:

* zfs_sb_teardown - prevent a NULL dereference by not calling
                    dmu_objset_pool with a null z_os.

* zfs_resume_fs - don't try to unmount with a null z_os.  This
                  change makes the ZoL code more consistent
                  with both Illumos and FreeBSD.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1543
This commit is contained in:
Tim Chase 2013-06-24 22:03:56 -05:00 committed by Brian Behlendorf
parent 64d7b6cf75
commit ab68b6e5db
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/zfs/zfs_vfsops.c
View File

@ -1056,10 +1056,12 @@ zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting)
}
/*
* Drain the iput_taskq to ensure all active references to the
* If someone has not already unmounted this file system,
* drain the iput_taskq to ensure all active references to the
* zfs_sb_t have been handled only then can it be safely destroyed.
*/
taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
if (zsb->z_os)
taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
/*
* Close the zil. NB: Can't close the zil while zfs_inactive
@ -1480,10 +1482,11 @@ bail:
if (err) {
/*
* Since we couldn't reopen zfs_sb_t, force
* unmount this file system.
* Since we couldn't reopen zfs_sb_t or, setup the
* sa framework, force unmount this file system.
*/
(void) zfs_umount(zsb->z_sb);
if (zsb->z_os)
(void) zfs_umount(zsb->z_sb);
}
return (err);
}