summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-03-22 18:22:59 +0000
committermartin <martin@NetBSD.org>2021-03-22 18:22:59 +0000
commitcefcb41b8812df13a12efb37cc6e3aeb5ea19dff (patch)
tree203983a9bf567b36415a46cfe4559b7c72d85974
parent0b164a33d2116b91281ebd75d3edcee150649215 (diff)
Pull up following revision(s) (requested by hannken in ticket #1235):
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h: revision 1.3 Use the right uid / gid for nobody:nobody like FreeBSD does. Prevents null pointer dereferences when ZFS replaces this illegal (according to IS_EPHEMERAL()) id with another illegal id in operation zfs_fuid_create_cred() and finally zfs_log_create() dereferences fuidp being NULL. Adresses PR misc/55042 (Panic when creating a directory on a NFS served ZFS)
-rw-r--r--external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h b/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h
index cadb8b7c713..37a40cea37d 100644
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h
@@ -157,13 +157,13 @@ extern "C" {
#define fm_panic panic
#define getf fd_getfile
#define getminor(a) minor(a)
-#define GID_NOBODY (-2)
+#define GID_NOBODY (39)
#define issig(x) (sigispending(curlwp, 0))
#define kmem_debugging() 0
#define releasef fd_putfile
#define strfree(str) kmem_free((str), strlen(str)+1)
#define td_ru l_ru
-#define UID_NOBODY (-2)
+#define UID_NOBODY (32767)
#define vnode_pager_setsize(vp, size) zfs_netbsd_setsize(vp, size)
#define zone_get_hostid(a) 0