On Fri, Apr 21, 2017 at 05:21:21PM +0200, Christoph Hellwig wrote:
> By passing the whole fsmap_head structure and an index we can get the
> user point annotations right for the embedded variable sized array
> in struct fsmap_head.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/xfs_ioctl.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 0f8bed9a7e4c..b7db0b8f0657 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1614,7 +1614,8 @@ xfs_ioc_getbmapx(
>
> struct getfsmap_info {
> struct xfs_mount *mp;
> - struct fsmap __user *data;
> + struct fsmap_head __user *data;
> + int idx;
This ought to be unsigned int since fmh_entries is u32. I'll fix
it when I commit the patch.
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> __u32 last_flags;
> };
>
> @@ -1628,17 +1629,17 @@ xfs_getfsmap_format(struct xfs_fsmap *xfm, void *priv)
>
> info->last_flags = xfm->fmr_flags;
> xfs_fsmap_from_internal(&fm, xfm);
> - if (copy_to_user(info->data, &fm, sizeof(struct fsmap)))
> + if (copy_to_user(&info->data->fmh_recs[info->idx++], &fm,
> + sizeof(struct fsmap)))
> return -EFAULT;
>
> - info->data++;
> return 0;
> }
>
> STATIC int
> xfs_ioc_getfsmap(
> struct xfs_inode *ip,
> - void __user *arg)
> + struct fsmap_head __user *arg)
> {
> struct getfsmap_info info = { NULL };
> struct xfs_fsmap_head xhead = {0};
> @@ -1664,7 +1665,7 @@ xfs_ioc_getfsmap(
> trace_xfs_getfsmap_high_key(ip->i_mount, &xhead.fmh_keys[1]);
>
> info.mp = ip->i_mount;
> - info.data = ((__force struct fsmap_head *)arg)->fmh_recs;
> + info.data = arg;
> error = xfs_getfsmap(ip->i_mount, &xhead, xfs_getfsmap_format, &info);
> if (error == XFS_BTREE_QUERY_RANGE_ABORT) {
> error = 0;
> @@ -1674,10 +1675,9 @@ xfs_ioc_getfsmap(
>
> /* If we didn't abort, set the "last" flag in the last fmx */
> if (!aborted && xhead.fmh_entries) {
> - info.data--;
> info.last_flags |= FMR_OF_LAST;
> - if (copy_to_user(&info.data->fmr_flags, &info.last_flags,
> - sizeof(info.last_flags)))
> + if (copy_to_user(&info.data->fmh_recs[info.idx - 1].fmr_flags,
> + &info.last_flags, sizeof(info.last_flags)))
> return -EFAULT;
> }
>
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
