Author: avg
Date: Thu Mar 1 08:30:08 2018
New Revision: 330234
URL: https://svnweb.freebsd.org/changeset/base/330234
Log:
MFC r329711: MFV r329710: 8966 use after end of the lifetime of a local
variable
PR: 225162
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Thu Mar
1 08:05:52 2018 (r330233)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Thu Mar
1 08:30:08 2018 (r330234)
@@ -1174,6 +1174,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;
@@ -1220,7 +1221,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),
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
