summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Chase <tim@chase2k.com>2019-10-24 16:14:13 -0600
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-10-25 15:43:34 -0600
commit5a120e272991505eb171d0469f79d937cced483a (patch)
tree13dd9908b928093c0909b963f7ab3ffbab66bf1e
parent90ffcda9b1f712011f19aba3612b22dcce407013 (diff)
downloadillumos-gate-5a120e272991505eb171d0469f79d937cced483a.tar.gz
11856 chown can trigger vmdump when running recentish zfs
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Chris Dunlop <chris@onthe.net.au> Reviewed by: Tom Caputi <tcaputi@datto.com> Reviewed by: Andy Stormont <AStormont@racktopsystems.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Reviewed by: Matthias Scheler <matthias.scheler@wdc.com> Reviewed by: Gergo Doma <domag02@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_vnops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c
index b19ef3698b..a5a8f79317 100644
--- a/usr/src/uts/common/fs/zfs/zfs_vnops.c
+++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c
@@ -2811,11 +2811,12 @@ zfs_setattr_dir(znode_t *dzp)
znode_t *zp = NULL;
dmu_tx_t *tx = NULL;
sa_bulk_attr_t bulk[4];
- int count = 0;
+ int count;
int err;
zap_cursor_init(&zc, os, dzp->z_id);
while ((err = zap_cursor_retrieve(&zc, &zap)) == 0) {
+ count = 0;
if (zap.za_integer_length != 8 || zap.za_num_integers != 1) {
err = ENXIO;
break;