CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Mon Sep 11 13:38:42 UTC 2023
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_ioctl.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #364):
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c: revision 1.26
Revert "Teach zfs bdevsw to do b_psize."
This is used only by dump and swap, which won't work safely on zvols
anyway. We should make swap work eventually, but right now it's
leading unwary ussers into deadlock scenarios, so let's make it fail
early instead.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25 Mon Oct 31 10:32:28 2022
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Mon Sep 11 13:38:42 2023
@@ -7062,29 +7062,6 @@ nb_zvol_strategy(struct buf *bp)
(void) zvol_strategy(bp);
}
-static int
-nb_zvol_psize(dev_t dev)
-{
- minor_t minor = getminor(dev);
- off_t nbytes;
- unsigned bytespersector;
-
- if (minor == 0) /* /dev/zfs */
- return -1;
-
- if (zvol_ioctl(dev, DIOCGMEDIASIZE, (intptr_t), 0,
- NOCRED, NULL))
- return -1;
- if (zvol_ioctl(dev, DIOCGSECTORSIZE, (intptr_t), 0,
- NOCRED, NULL))
- return -1;
- if (bytespersector == 0) /* paranoia */
- return -1;
- if (nbytes/bytespersector > INT_MAX) /* paranoia */
- return -1;
- return nbytes/bytespersector;
-}
-
static const struct fileops zfs_fileops = {
.fo_name = "zfs",
.fo_read = fbadop_read,
@@ -7104,7 +7081,7 @@ const struct bdevsw zfs_bdevsw = {
.d_strategy = nb_zvol_strategy,
.d_ioctl = nb_zfsdev_ioctl,
.d_dump = nodump,
- .d_psize = nb_zvol_psize,
+ .d_psize = nosize,
.d_flag = D_DISK | D_MPSAFE
};
CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Sep 11 13:38:42 UTC 2023 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_ioctl.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #364): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c: revision 1.26 Revert "Teach zfs bdevsw to do b_psize." This is used only by dump and swap, which won't work safely on zvols anyway. We should make swap work eventually, but right now it's leading unwary ussers into deadlock scenarios, so let's make it fail early instead. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Sun Mar 5 14:32:42 UTC 2023
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #110):
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.81
Adapt zfs_netbsd_access() to ACL support. As ZFS itself only
handles VREAD, VWRITE, VEXEC and VAPPEND we use kauth_authorize_vnode()
to handle VADMIN.
>From FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.80 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.80.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.80 Mon Oct 3 16:04:19 2022
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sun Mar 5 14:32:41 2023
@@ -5169,33 +5169,47 @@ zfs_netbsd_access(void *v)
accmode_t a_accmode;
kauth_cred_t a_cred;
} */ *ap = v;
- struct vnode *vp = ap->a_vp;
- accmode_t accmode = ap->a_accmode;
- mode_t zfs_mode = 0;
+ vnode_t *vp = ap->a_vp;
+ znode_t *zp = VTOZ(vp);
+ accmode_t accmode;
kauth_cred_t cred = ap->a_cred;
- int error;
+ int error = 0;
/*
- * XXX This is really random, especially the left shift by six,
- * and it exists only because of randomness in zfs_unix_to_v4
- * and zfs_zaccess_rwx in zfs_acl.c.
+ * ZFS itself only knowns about VREAD, VWRITE, VEXEC and VAPPEND,
*/
- if (accmode & VREAD)
- zfs_mode |= S_IROTH;
- if (accmode & VWRITE)
- zfs_mode |= S_IWOTH;
- if (accmode & VEXEC)
- zfs_mode |= S_IXOTH;
- zfs_mode <<= 6;
+ accmode = ap->a_accmode & (VREAD|VWRITE|VEXEC|VAPPEND);
+ if (accmode != 0)
+ error = zfs_access(vp, accmode, 0, cred, NULL);
- KASSERT(VOP_ISLOCKED(vp));
- error = zfs_access(vp, zfs_mode, 0, cred, NULL);
+ /*
+ * VADMIN has to be handled by kauth_authorize_vnode().
+ */
+ if (error == 0) {
+ accmode = ap->a_accmode & ~(VREAD|VWRITE|VEXEC|VAPPEND);
+ if (accmode != 0) {
+ error = kauth_authorize_vnode(cred,
+ KAUTH_ACCESS_ACTION(accmode, vp->v_type,
+ zp->z_mode & ALLPERMS), vp, NULL,
+ genfs_can_access(vp, cred, zp->z_uid,
+ zp->z_gid, zp->z_mode & ALLPERMS, NULL, accmode));
+ }
+ }
+
+ /*
+ * For VEXEC, ensure that at least one execute bit is set for
+ * non-directories.
+ */
+ if (error == 0 && (ap->a_accmode & VEXEC) != 0 && vp->v_type != VDIR &&
+ (zp->z_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0) {
+ error = EACCES;
+ }
/* We expect EACCES as common error. */
if (error == EPERM)
error = EACCES;
- return (error);
+ return error;
}
static int
CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Sun Mar 5 14:32:42 UTC 2023 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_vnops.c Log Message: Pull up following revision(s) (requested by hannken in ticket #110): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.81 Adapt zfs_netbsd_access() to ACL support. As ZFS itself only handles VREAD, VWRITE, VEXEC and VAPPEND we use kauth_authorize_vnode() to handle VADMIN. >From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.80.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
