diff options
| author | Brian Behlendorf <[email protected]> | 2019-05-08 10:04:04 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-05-08 10:04:04 -0700 |
| commit | 515ddf65042e8eb772c3f38ed4556850a0c2fbf3 (patch) | |
| tree | 4e6c28535d5f3fc991b941c781d01b91d6d11c58 /module/zfs/zfs_vnops.c | |
| parent | 1f02ecc5a56d08b744b618c641505c451bd9b1e4 (diff) | |
Fix errant EFAULT during writes (#8719)
Commit 98bb45e resolved a deadlock which could occur when
handling a page fault in zfs_write(). This change added
the uio_fault_disable field to the uio structure but failed
to initialize it to B_FALSE. This uninitialized field would
cause uiomove_iov() to call __copy_from_user_inatomic()
instead of copy_from_user() resulting in unexpected EFAULTs.
Resolve the issue by fully initializing the uio, and clearing
the uio_fault_disable flags after it's used in zfs_write().
Additionally, reorder the uio_t field assignments to match
the order the fields are declared in the structure.
Reviewed-by: Chunwei Chen <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #8640
Closes #8719
Diffstat (limited to 'module/zfs/zfs_vnops.c')
| -rw-r--r-- | module/zfs/zfs_vnops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index 281f58249..27f179d82 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -822,6 +822,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) uio->uio_fault_disable = B_TRUE; error = dmu_write_uio_dbuf(sa_get_db(zp->z_sa_hdl), uio, nbytes, tx); + uio->uio_fault_disable = B_FALSE; if (error == EFAULT) { dmu_tx_commit(tx); if (uio_prefaultpages(MIN(n, max_blksz), uio)) { |