diff options
| author | Jorgen Lundman <[email protected]> | 2020-08-14 07:03:23 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-13 15:03:23 -0700 |
| commit | faa296c73c7ccd535c0874d4f7e8f7c4ea43eea6 (patch) | |
| tree | 2fb84bfdea8f4f357b66d125d1596748edff0abd /module | |
| parent | f67f5832eca415055e1eaf6cdc100f24ae53487a (diff) | |
Release onexit/events with any missed zfsdev_state
Linux and FreeBSD will most likely never see this issue.
On macOS when kext is unloaded, but zed is still connected, zed
will be issued ENODEV. As the cdevsw is released, the kernel
will not have zfsdev_release() called to release minor/onexit/events,
and it "leaks". This ensures it is cleaned up before unload.
Changed the for loop from zsprev, to zsnext style, for less
code duplication.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Jorgen Lundman <[email protected]>
Closes #10700
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/freebsd/zfs/kmod_core.c | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zfs_ioctl_os.c | 2 | ||||
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 15 |
3 files changed, 12 insertions, 7 deletions
diff --git a/module/os/freebsd/zfs/kmod_core.c b/module/os/freebsd/zfs/kmod_core.c index 89f499640..dce73577e 100644 --- a/module/os/freebsd/zfs/kmod_core.c +++ b/module/os/freebsd/zfs/kmod_core.c @@ -201,6 +201,8 @@ zfsdev_close(void *data) zfs_onexit_destroy(zs->zs_onexit); zfs_zevent_destroy(zs->zs_zevent); mutex_exit(&zfsdev_state_lock); + zs->zs_onexit = NULL; + zs->zs_zevent = NULL; } static int diff --git a/module/os/linux/zfs/zfs_ioctl_os.c b/module/os/linux/zfs/zfs_ioctl_os.c index 457f4e8ea..52c5ed883 100644 --- a/module/os/linux/zfs/zfs_ioctl_os.c +++ b/module/os/linux/zfs/zfs_ioctl_os.c @@ -148,6 +148,8 @@ zfsdev_state_destroy(struct file *filp) zs->zs_minor = -1; zfs_onexit_destroy(zs->zs_onexit); zfs_zevent_destroy(zs->zs_zevent); + zs->zs_onexit = NULL; + zs->zs_zevent = NULL; return (0); } diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index d0d5207b4..10b37a4ad 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -7609,19 +7609,20 @@ out: void zfs_kmod_fini(void) { - zfsdev_state_t *zs, *zsprev = NULL; + zfsdev_state_t *zs, *zsnext = NULL; zfsdev_detach(); mutex_destroy(&zfsdev_state_lock); - for (zs = zfsdev_state_list; zs != NULL; zs = zs->zs_next) { - if (zsprev) - kmem_free(zsprev, sizeof (zfsdev_state_t)); - zsprev = zs; + for (zs = zfsdev_state_list; zs != NULL; zs = zsnext) { + zsnext = zs->zs_next; + if (zs->zs_onexit) + zfs_onexit_destroy(zs->zs_onexit); + if (zs->zs_zevent) + zfs_zevent_destroy(zs->zs_zevent); + kmem_free(zs, sizeof (zfsdev_state_t)); } - if (zsprev) - kmem_free(zsprev, sizeof (zfsdev_state_t)); zfs_fini(); spa_fini(); |