Btrfs: do not overwrite error return value in the get device stats ioctl
diff mbox series

Message ID 20181214194522.21791-1-fdmanana@kernel.org
State New
Headers show
Series
  • Btrfs: do not overwrite error return value in the get device stats ioctl
Related show

Commit Message

Filipe Manana Dec. 14, 2018, 7:45 p.m. UTC
From: Filipe Manana <fdmanana@suse.com>

If the call to btrfs_get_dev_stats() failed we would overwrite the error
returned to user space with -EFAULT if the call to copy_to_user() failed
as well. Fix that by calling copy_to_user() only if btrfs_get_dev_stats()
returned success.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 fs/btrfs/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Johannes Thumshirn Dec. 17, 2018, 8:45 a.m. UTC | #1
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

But I agree with Nick's review on the scrub progress ioctl patch,
splitting the error handling into two parts is easier to read.

Patch
diff mbox series

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 76848214a39f..0b101df822e9 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4355,7 +4355,7 @@  static long btrfs_ioctl_get_dev_stats(struct btrfs_fs_info *fs_info,
 
 	ret = btrfs_get_dev_stats(fs_info, sa);
 
-	if (copy_to_user(arg, sa, sizeof(*sa)))
+	if (ret == 0 && copy_to_user(arg, sa, sizeof(*sa)))
 		ret = -EFAULT;
 
 	kfree(sa);