From: Anand Jain <anand.jain@oracle.com>
To: fdmanana@kernel.org, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] Btrfs: do not overwrite error return value in the device replace ioctl
Date: Mon, 17 Dec 2018 18:30:12 +0800 [thread overview]
Message-ID: <1a06c374-c9b2-db42-0fec-8358084fbea1@oracle.com> (raw)
In-Reply-To: <20181214194532.21841-1-fdmanana@kernel.org>
On 12/15/2018 03:45 AM, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
>
> If the call to btrfs_dev_replace_by_ioctl() 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 no error
> happened before.
>
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---
> fs/btrfs/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 0b101df822e9..abe45fd97ab5 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -4401,7 +4401,7 @@ static long btrfs_ioctl_dev_replace(struct btrfs_fs_info *fs_info,
> break;
> }
>
> - if (copy_to_user(arg, p, sizeof(*p)))
> + if (ret == 0 && copy_to_user(arg, p, sizeof(*p)))
Its the same thing here too.. we copy ret to args->result even
if it fails. Now with this patch, if ret is non-zero, its not
in args->result at the userland anymore. If there
is any tool which just checks args->result will be at problem,
which I think is rare, should be ok. It would have been nice
to have this design as in this patch, in the original code.
------
530 ret = btrfs_dev_replace_start(fs_info,
args->start.tgtdev_name,
531 args->start.srcdevid,
532 args->start.srcdev_name,
533
args->start.cont_reading_from_srcdev_mode);
534 args->result = ret;
--------
> ret = -EFAULT;
> out:
> kfree(p);
>
next prev parent reply other threads:[~2018-12-17 10:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 19:45 [PATCH] Btrfs: do not overwrite error return value in the device replace ioctl fdmanana
2018-12-17 10:30 ` Anand Jain [this message]
2019-01-08 11:42 ` [PATCH v2] " fdmanana
2019-01-08 15:57 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1a06c374-c9b2-db42-0fec-8358084fbea1@oracle.com \
--to=anand.jain@oracle.com \
--cc=fdmanana@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).