svn commit: r329711 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Wed Feb 21 14:17:08 UTC 2018
Author: avg
Date: Wed Feb 21 14:17:07 2018
New Revision: 329711
URL: https://svnweb.freebsd.org/changeset/base/329711
Log:
MFV r329710: 8966 Source file zfs_acl.c, function zfs_aclset_common contains a use after end of the lifetime of a local variable
illumos/illumos-gate at 82693e09cc02331fa1b3b73b54b1060e73507a8d
https://github.com/illumos/illumos-gate/commit/82693e09cc02331fa1b3b73b54b1060e73507a8d
https://www.illumos.org/issues/8966
Reviewed by: Matt Ahrens <mahrens at delphix.com>
Reviewed by: Andriy Gapon <avg at FreeBSD.org>
Approved by: Richard Lowe <richlowe at richlowe.net>
Author: WHR <msl0000023508 at gmail.com>
PR: 225162
Submitted by: WHR <msl0000023508 at gmail.com>
Reported by: WHR <msl0000023508 at gmail.com>
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed Feb 21 14:12:29 2018 (r329710)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed Feb 21 14:17:07 2018 (r329711)
@@ -1171,6 +1171,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t
sa_bulk_attr_t bulk[5];
uint64_t ctime[2];
int count = 0;
+ zfs_acl_phys_t acl_phys;
mode = zp->z_mode;
@@ -1217,7 +1218,6 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t
} else { /* Painful legacy way */
zfs_acl_node_t *aclnode;
uint64_t off = 0;
- zfs_acl_phys_t acl_phys;
uint64_t aoid;
if ((error = sa_lookup(zp->z_sa_hdl, SA_ZPL_ZNODE_ACL(zfsvfs),
More information about the svn-src-head
mailing list