diff options
| author | Filipe Manana <fdmanana@suse.com> | 2018-12-14 19:50:17 +0000 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-02-25 14:13:15 +0100 |
| commit | 06fe39ab15a6a47d4979460fcc17d33b1d72ccf9 (patch) | |
| tree | 794a4d4ec05e118851d6eee5dff6b743deb96e14 /fs/btrfs/ioctl.c | |
| parent | bc9a8bf79cb049eb3af26d53e6ca96dd6a881358 (diff) | |
| download | lwn-06fe39ab15a6a47d4979460fcc17d33b1d72ccf9.tar.gz lwn-06fe39ab15a6a47d4979460fcc17d33b1d72ccf9.zip | |
Btrfs: do not overwrite scrub error with fault error in scrub ioctl
If scrub returned an error and then the copy_to_user() call did not
succeed, we would overwrite the error returned by scrub with -EFAULT.
Fix that by calling copy_to_user() only if btrfs_scrub_dev() returned
success.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 9c8e1734429c..d34e54d80149 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4381,7 +4381,7 @@ static long btrfs_ioctl_scrub(struct file *file, void __user *arg) &sa->progress, sa->flags & BTRFS_SCRUB_READONLY, 0); - if (copy_to_user(arg, sa, sizeof(*sa))) + if (ret == 0 && copy_to_user(arg, sa, sizeof(*sa))) ret = -EFAULT; if (!(sa->flags & BTRFS_SCRUB_READONLY)) |