c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

zfs userspace dumps core when used on ZVOLs

Browse Source 
If you try to get the userspace, groupspace or projectspace on a ZVOL,
the generated error results in passing EINVAL to
zfs_standard_error_fmt() when we should return a specific error to
inform the user that those properties aren't available on volumes.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Tom Caputi <tcaputi@datto.com>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #8279
This commit is contained in:
loli10K 2019-01-25 18:47:52 +01:00 committed by Brian Behlendorf
parent 8fccfa8e17
commit 7646af20ad
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/zfs/zfs_main.c
View File

@ -3037,8 +3037,15 @@ zfs_do_userspace(int argc, char **argv)
} while (delim != NULL); } while (delim != NULL);
} }
if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL) if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_FILESYSTEM |
ZFS_TYPE_SNAPSHOT)) == NULL)
return (1); return (1);
if (zhp->zfs_head_type != ZFS_TYPE_FILESYSTEM) {
(void) fprintf(stderr, gettext("operation is only applicable "
"to filesystems and their snapshots\n"));
zfs_close(zhp);
return (1);
}
if ((avl_pool = uu_avl_pool_create("us_avl_pool", sizeof (us_node_t), if ((avl_pool = uu_avl_pool_create("us_avl_pool", sizeof (us_node_t),
offsetof(us_node_t, usn_avlnode), us_compare, UU_DEFAULT)) == NULL) offsetof(us_node_t, usn_avlnode), us_compare, UU_DEFAULT)) == NULL)
@ -3069,9 +3076,12 @@ zfs_do_userspace(int argc, char **argv)
continue; continue;
cb.cb_prop = p; cb.cb_prop = p;
if ((ret = zfs_userspace(zhp, p, userspace_cb, &cb)) != 0) if ((ret = zfs_userspace(zhp, p, userspace_cb, &cb)) != 0) {
zfs_close(zhp);
return (ret); return (ret);
}
} }
zfs_close(zhp);
/* Sort the list */ /* Sort the list */
if ((node = uu_avl_first(avl_tree)) == NULL) if ((node = uu_avl_first(avl_tree)) == NULL)