[PATCH] btrfs: Return EINVAL when length to trim is less than FSB

[PATCH] btrfs: Return EINVAL when length to trim is less than FSB

[Lukas Czerner]

Currently if len argument in btrfs_ioctl_fitrim() is smaller than
one FSB we will continue and finally return 0 bytes discarded.
However if the length to discard is smaller then file system block
we should really return EINVAL.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 fs/btrfs/ioctl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 6116880..3b8b509 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -343,7 +343,8 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)
 		return -EOPNOTSUPP;
 	if (copy_from_user(&range, arg, sizeof(range)))
 		return -EFAULT;
-	if (range.start > total_bytes)
+	if (range.start > total_bytes ||
+	    range.len < fs_info->sb->s_blocksize)
 		return -EINVAL;
 
 	range.len = min(range.len, total_bytes - range.start);
-- 
1.7.7.6

Re: [PATCH] btrfs: Return EINVAL when length to trim is less than FSB

[Lukáš Czerner]

On Tue, 16 Oct 2012, Lukas Czerner wrote:

> Date: Tue, 16 Oct 2012 11:34:36 +0200
> From: Lukas Czerner <lczerner@redhat.com>
> To: linux-btrfs@vger.kernel.org
> Cc: jbacik@fusionio.com, Lukas Czerner <lczerner@redhat.com>
> Subject: [PATCH] btrfs: Return EINVAL when length to trim is less than FSB
> 
> Currently if len argument in btrfs_ioctl_fitrim() is smaller than
> one FSB we will continue and finally return 0 bytes discarded.
> However if the length to discard is smaller then file system block
> we should really return EINVAL.

ping

> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> ---
>  fs/btrfs/ioctl.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 6116880..3b8b509 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -343,7 +343,8 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)
>  		return -EOPNOTSUPP;
>  	if (copy_from_user(&range, arg, sizeof(range)))
>  		return -EFAULT;
> -	if (range.start > total_bytes)
> +	if (range.start > total_bytes ||
> +	    range.len < fs_info->sb->s_blocksize)
>  		return -EINVAL;
>  
>  	range.len = min(range.len, total_bytes - range.start);
> 

Re: [PATCH] btrfs: Return EINVAL when length to trim is less than FSB

[Li Zefan]

On 2012/10/24 16:15, Lukáš Czerner wrote:
> On Tue, 16 Oct 2012, Lukas Czerner wrote:
> 
>> Date: Tue, 16 Oct 2012 11:34:36 +0200
>> From: Lukas Czerner <lczerner@redhat.com>
>> To: linux-btrfs@vger.kernel.org
>> Cc: jbacik@fusionio.com, Lukas Czerner <lczerner@redhat.com>
>> Subject: [PATCH] btrfs: Return EINVAL when length to trim is less than FSB
>>
>> Currently if len argument in btrfs_ioctl_fitrim() is smaller than
>> one FSB we will continue and finally return 0 bytes discarded.
>> However if the length to discard is smaller then file system block
>> we should really return EINVAL.
> 
> ping
> 

This patch has already sit in Josef's btrfs-next tree:

http://git.kernel.org/?p=linux/kernel/git/josef/btrfs-next.git;a=commit;h=cd50b6b30f09446eafdd715db6d59299fcc5b19a