diff options
| author | Tom Caputi <[email protected]> | 2018-03-31 14:12:51 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-03-31 11:12:51 -0700 |
| commit | a2c2ed1bd4c3dc6d52b6058b9c74245cad2ae331 (patch) | |
| tree | de5ad1fd1bc04f0ee496316305871d0b0e26d74e /module/zfs/dmu_objset.c | |
| parent | 4515b1d01c936b8cf156e20ba42cdb8916bca80b (diff) | |
Decryption error handling improvements
Currently, the decryption and block authentication code in
the ZIO / ARC layers is a bit inconsistent with regards to
the ereports that are produces and the error codes that are
passed to calling functions. This patch ensures that all of
these errors (which begin as ECKSUM) are converted to EIO
before they leave the ZIO or ARC layer and that ereports
are correctly generated on each decryption / authentication
failure.
In addition, this patch fixes a bug in zio_decrypt() where
ECKSUM never gets written to zio->io_error.
Reviewed by: Matt Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7372
Diffstat (limited to 'module/zfs/dmu_objset.c')
| -rw-r--r-- | module/zfs/dmu_objset.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index de7bbf894..8efc31546 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -686,8 +686,12 @@ dmu_objset_own_impl(dsl_dataset_t *ds, dmu_objset_type_t type, /* if we are decrypting, we can now check MACs in os->os_phys_buf */ if (decrypt && arc_is_unauthenticated((*osp)->os_phys_buf)) { + zbookmark_phys_t zb; + + SET_BOOKMARK(&zb, ds->ds_object, ZB_ROOT_OBJECT, + ZB_ROOT_LEVEL, ZB_ROOT_BLKID); err = arc_untransform((*osp)->os_phys_buf, (*osp)->os_spa, - ds->ds_object, B_FALSE); + &zb, B_FALSE); if (err != 0) return (err); |