Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix use-after-free of zfsvfs after unmount #288

Merged
merged 1 commit into from
Oct 14, 2023
Merged

Fix use-after-free of zfsvfs after unmount #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions module/os/windows/zfs/zfs_vfsops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,6 +1565,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
int
zfs_vfs_unmount(struct mount *mp, int mntflags, vfs_context_t context)
{
mount_t *mp_dcb = NULL;
zfsvfs_t *zfsvfs = vfs_fsprivate(mp);
objset_t *os;
char osname[MAXNAMELEN];
Expand Down Expand Up @@ -1670,6 +1671,15 @@ zfs_vfs_unmount(struct mount *mp, int mntflags, vfs_context_t context)
dmu_objset_disown(os, B_TRUE, zfsvfs);
}

mp_dcb = mp->parent_device;
if (likely(mp_dcb != NULL)) {
if (mp_dcb->type == MOUNT_TYPE_DCB) {
// dcb also has a reference to zfsvfs, we need to
// remove that before it is freed.
vfs_setfsprivate(mp_dcb, NULL);
}
}

zfs_freevfs(zfsvfs->z_vfs);

return (0);
Expand Down
16 changes: 16 additions & 0 deletions module/os/windows/zfs/zfs_vnops_windows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ zfs_AcquireForLazyWrite(void *Context, BOOLEAN Wait)
struct vnode *vp = fo->FsContext;
dprintf("%s:fo %p\n", __func__, fo);

if (unlikely(zfsvfs == NULL)) {
dprintf("%s: fo %p already freed zfsvfs\n", __func__, fo);
return (FALSE);
}

EchterAgo marked this conversation as resolved.
Show resolved Hide resolved
/* Confirm we are mounted, and stop unmounting */
if (vfs_busy(zfsvfs->z_vfs, 0) != 0)
return (FALSE);
Expand Down Expand Up @@ -210,6 +215,11 @@ zfs_AcquireForReadAhead(void *Context, BOOLEAN Wait)

dprintf("%s:\n", __func__);

if (unlikely(zfsvfs == NULL)) {
dprintf("%s: fo %p already freed zfsvfs\n", __func__, fo);
return (FALSE);
}

if (vfs_busy(zfsvfs->z_vfs, 0) != 0)
return (FALSE);

Expand Down Expand Up @@ -7950,6 +7960,12 @@ fastio_acquire_for_mod_write(PFILE_OBJECT FileObject,
NTSTATUS Status = STATUS_INVALID_PARAMETER;
dprintf("%s: \n", __func__);

if (unlikely(zfsvfs == NULL)) {
dprintf("%s: fo %p already freed zfsvfs\n", __func__,
FileObject);
return (STATUS_INVALID_PARAMETER);
}

if (vfs_busy(zfsvfs->z_vfs, 0) != 0)
return (STATUS_INVALID_PARAMETER);

Expand Down
Loading