On Thu, Dec 19, 2013 at 3:56 PM, John Stultz <john.stu...@linaro.org> wrote:
> Prior to subitting this, Colin reworked the compat_ioctl support
> for the ion_test driver, moving the structure to be the same size
> on both 32 and 64 bit architectures.
>
> Two small things were left out. The compat_ioctl ptr assignment,
> and the fact that despite having uniform sized types in the
> structure, the structure pads out to different sizes on different
> arches.
>
> This patch resolves this issue by adding a padding entry after
> the write flag, and adding the compat_ioctl ptr.
>
> Changes in v2:
> - Add a padding int rather then making write a u64
>
> Cc: Colin Cross <ccr...@android.com>
> Cc: Greg KH <gre...@linuxfoundation.org>
> Cc: Android Kernel Team <kernel-t...@android.com>
> Signed-off-by: John Stultz <john.stu...@linaro.org>
> ---
> drivers/staging/android/ion/ion_test.c | 1 +
> drivers/staging/android/uapi/ion_test.h | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/drivers/staging/android/ion/ion_test.c
> b/drivers/staging/android/ion/ion_test.c
> index 3e20349..654acb5 100644
> --- a/drivers/staging/android/ion/ion_test.c
> +++ b/drivers/staging/android/ion/ion_test.c
> @@ -231,6 +231,7 @@ static int ion_test_release(struct inode *inode, struct
> file *file)
> static const struct file_operations ion_test_fops = {
> .owner = THIS_MODULE,
> .unlocked_ioctl = ion_test_ioctl,
> + .compat_ioctl = ion_test_ioctl,
> .open = ion_test_open,
> .release = ion_test_release,
> };
> diff --git a/drivers/staging/android/uapi/ion_test.h
> b/drivers/staging/android/uapi/ion_test.h
> index 614d1e3..ffef06f 100644
> --- a/drivers/staging/android/uapi/ion_test.h
> +++ b/drivers/staging/android/uapi/ion_test.h
> @@ -32,6 +32,7 @@ struct ion_test_rw_data {
> __u64 offset;
> __u64 size;
> int write;
> + int __padding;
> };
>
> #define ION_IOC_MAGIC 'I'
> --
> 1.8.3.2
>
> To unsubscribe from this group and stop receiving emails from it, send an
> email to kernel-team+unsubscr...@android.com.
Acked-by: Colin Cross <ccr...@android.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
