[Cluster-devel] [PATCH 1/2] gfs2: Require user to provide argument for FITRIM
Steven Whitehouse
swhiteho at redhat.com
Tue Oct 16 10:40:06 UTC 2012
Hi,
Thanks for fix up my mistakes :-) Both patches are now in the -nmw tree,
Steve.
On Tue, 2012-10-16 at 11:39 +0200, Lukas Czerner wrote:
> When the fstrim_range argument is not provided by user in FITRIM ioctl
> we should just return EFAULT and not promoting bad behaviour by filling
> the structure in kernel. Let the user deal with it.
>
> Signed-off-by: Lukas Czerner <lczerner at redhat.com>
> ---
> fs/gfs2/rgrp.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
> index 3cc402c..ef00006 100644
> --- a/fs/gfs2/rgrp.c
> +++ b/fs/gfs2/rgrp.c
> @@ -1271,11 +1271,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
> if (!blk_queue_discard(q))
> return -EOPNOTSUPP;
>
> - if (argp == NULL) {
> - r.start = 0;
> - r.len = ULLONG_MAX;
> - r.minlen = 0;
> - } else if (copy_from_user(&r, argp, sizeof(r)))
> + if (copy_from_user(&r, argp, sizeof(r)))
> return -EFAULT;
>
> ret = gfs2_rindex_update(sdp);
> @@ -1324,7 +1320,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
>
> out:
> r.len = trimmed << 9;
> - if (argp && copy_to_user(argp, &r, sizeof(r)))
> + if (copy_to_user(argp, &r, sizeof(r)))
> return -EFAULT;
>
> return ret;
More information about the Cluster-devel
mailing list