Skip to content

Commit

Permalink
OpenZFS 8966 - Source file zfs_acl.c, function zfs_aclset_common cont…
Browse files Browse the repository at this point in the history
…ains a use after end of the lifetime of a local variable

Authored by: WHR <msl0000023508@gmail.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Andriy Gapon <avg@FreeBSD.org>
Reviewed by: George Melikov <mail@gmelikov.ru>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Richard Lowe <richlowe@richlowe.net>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

OpenZFS-issue: https://www.illumos.org/issues/8966
OpenZFS-commit: openzfs/openzfs@c95549fcdc
Closes openzfs#7141
  • Loading branch information
Low-power authored and tonyhutter committed Mar 13, 2018
1 parent 3780c49 commit 6e12f4e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion module/zfs/zfs_acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
sa_bulk_attr_t bulk[5];
uint64_t ctime[2];
int count = 0;
zfs_acl_phys_t acl_phys;

mode = zp->z_mode;

Expand Down Expand Up @@ -1369,7 +1370,6 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
} 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),
Expand Down

0 comments on commit 6e12f4e

Please sign in to comment.