The compat support added to ion didn't provide compat ioctl numbers
(who's value depends on the compat structure size). So 32bit
applications would get an error when trying to make ioctl calls.
This patch adds the needed COMPAT_ macros and uses them in the
compat_ion_ioctl, translating them to their non-compat cmd when
calling the normal ioctl call.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+#define COMPAT_ION_IOC_ALLOC _IOWR(ION_IOC_MAGIC, 0, \
+ struct compat_ion_allocation_data)
+#define COMPAT_ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data)
+#define COMPAT_ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, \
+ struct compat_ion_custom_data)
+
static int compat_get_ion_allocation_data(
struct compat_ion_allocation_data __user *data32,
struct ion_allocation_data __user *data)
static int compat_get_ion_allocation_data(
struct compat_ion_allocation_data __user *data32,
struct ion_allocation_data __user *data)
return -ENOTTY;
switch (cmd) {
return -ENOTTY;
switch (cmd) {
+ case COMPAT_ION_IOC_ALLOC:
{
struct compat_ion_allocation_data __user *data32;
struct ion_allocation_data __user *data;
{
struct compat_ion_allocation_data __user *data32;
struct ion_allocation_data __user *data;
err = compat_get_ion_allocation_data(data32, data);
if (err)
return err;
err = compat_get_ion_allocation_data(data32, data);
if (err)
return err;
-
- ret = filp->f_op->unlocked_ioctl(filp, cmd,
+ ret = filp->f_op->unlocked_ioctl(filp, ION_IOC_ALLOC,
(unsigned long)data);
err = compat_put_ion_allocation_data(data32, data);
return ret ? ret : err;
}
(unsigned long)data);
err = compat_put_ion_allocation_data(data32, data);
return ret ? ret : err;
}
+ case COMPAT_ION_IOC_FREE:
{
struct compat_ion_allocation_data __user *data32;
struct ion_allocation_data __user *data;
{
struct compat_ion_allocation_data __user *data32;
struct ion_allocation_data __user *data;
- return filp->f_op->unlocked_ioctl(filp, cmd,
+ return filp->f_op->unlocked_ioctl(filp, ION_IOC_FREE,
+ case COMPAT_ION_IOC_CUSTOM: {
struct compat_ion_custom_data __user *data32;
struct ion_custom_data __user *data;
int err;
struct compat_ion_custom_data __user *data32;
struct ion_custom_data __user *data;
int err;
- return filp->f_op->unlocked_ioctl(filp, cmd,
+ return filp->f_op->unlocked_ioctl(filp, ION_IOC_CUSTOM,
(unsigned long)data);
}
case ION_IOC_SHARE:
(unsigned long)data);
}
case ION_IOC_SHARE: