diff options
| author | Jason King <jason.king@joyent.com> | 2019-11-11 18:49:24 -0600 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2019-11-13 12:40:50 -0600 |
| commit | 28df1ae01e4451dbbaeff3611e2544dda0f99f2b (patch) | |
| tree | 868b8630f8696d7c62c213348093178c65946a1f | |
| parent | 0dd73f5050147fcb75220c140b5372810dcf9887 (diff) | |
| download | illumos-joyent-28df1ae01e4451dbbaeff3611e2544dda0f99f2b.tar.gz | |
11947 zfs diff on encrypted dataset leaks key reference
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 13d3d56ed7..a46390cceb 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -25,7 +25,7 @@ * Portions Copyright 2011 Martin Matuska * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2014, 2016 Joyent, Inc. All rights reserved. + * Copyright 2019 Joyent, Inc. * Copyright (c) 2011, 2017 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. @@ -5668,7 +5668,7 @@ zfs_ioc_next_obj(zfs_cmd_t *zc) objset_t *os = NULL; int error; - error = dmu_objset_hold_flags(zc->zc_name, B_TRUE, FTAG, &os); + error = dmu_objset_hold(zc->zc_name, FTAG, &os); if (error != 0) return (error); |