2011-06-10 21:59:20

by Hartley Sweeten

Subject: [PATCH] ext3/ioctl.c: quite sparse warnings about different address spaces

The 'from' argument for copy_from_user and the 'to' argument for
copy_to_user should both be tagged as __user address space.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andreas Dilger <[email protected]>

---

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index f4090bd..c7f4394 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -285,7 +285,7 @@ group_add_out:
if (!capable(CAP_SYS_ADMIN))
return -EPERM;

- if (copy_from_user(&range, (struct fstrim_range *)arg,
+ if (copy_from_user(&range, (struct fstrim_range __user *)arg,
sizeof(range)))
return -EFAULT;

@@ -293,7 +293,7 @@ group_add_out:
if (ret < 0)
return ret;

- if (copy_to_user((struct fstrim_range *)arg, &range,
+ if (copy_to_user((struct fstrim_range __user *)arg, &range,
sizeof(range)))
return -EFAULT;

2011-06-13 13:47:07

by Jan Kara

Subject: Re: [PATCH] ext3/ioctl.c: quite sparse warnings about different address spaces

On Fri 10-06-11 14:59:05, H Hartley Sweeten wrote:
> The 'from' argument for copy_from_user and the 'to' argument for
> copy_to_user should both be tagged as __user address space.
>
> Signed-off-by: H Hartley Sweeten <[email protected]>
> Cc: Jan Kara <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Andreas Dilger <[email protected]>
Thanks. Merged.

Honza
>
> ---
>
> diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
> index f4090bd..c7f4394 100644
> --- a/fs/ext3/ioctl.c
> +++ b/fs/ext3/ioctl.c
> @@ -285,7 +285,7 @@ group_add_out:
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
>
> - if (copy_from_user(&range, (struct fstrim_range *)arg,
> + if (copy_from_user(&range, (struct fstrim_range __user *)arg,
> sizeof(range)))
> return -EFAULT;
>
> @@ -293,7 +293,7 @@ group_add_out:
> if (ret < 0)
> return ret;
>
> - if (copy_to_user((struct fstrim_range *)arg, &range,
> + if (copy_to_user((struct fstrim_range __user *)arg, &range,
> sizeof(range)))
> return -EFAULT;
>
--
Jan Kara <[email protected]>
SUSE Labs, CR