Module Name: src
Committed By: christos
Date: Sat Aug 18 11:59:25 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_fuid.c
Log Message:
make sure rid and idx are initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.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_fuid.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.4 Mon May 28 17:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c Sat Aug 18 07:59:25 2018
@@ -605,8 +605,14 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64
rid = FUID_RID(fuidp->z_fuid_group);
idx = FUID_INDEX(fuidp->z_fuid_group);
break;
+ default:
+ rid = UID_NOBODY;
+ break;
};
- domain = fuidp->z_domain_table[idx - 1];
+ if (idx == 0)
+ domain = nulldomain;
+ else
+ domain = fuidp->z_domain_table[idx - 1];
} else {
if (type == ZFS_OWNER || type == ZFS_ACE_USER)
status = kidmap_getsidbyuid(crgetzone(cr), id,
