staging: alarm-dev: Implement compat_ioctl support

Implement compat_ioctl support for the alarm-dev ioctl.

Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Colin Cross <ccross@google.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 43af3b3..ceb1c64 100644 (file)
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -274,6 +274,38 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
        return rv;
 }
+#ifdef CONFIG_COMPAT
+static long alarm_compat_ioctl(struct file *file, unsigned int cmd,
+                                                       unsigned long arg)
+{
+
+       struct timespec ts;
+       int rv;
+
+       switch (ANDROID_ALARM_BASE_CMD(cmd)) {
+       case ANDROID_ALARM_SET_AND_WAIT_COMPAT(0):
+       case ANDROID_ALARM_SET_COMPAT(0):
+       case ANDROID_ALARM_SET_RTC_COMPAT:
+               if (compat_get_timespec(&ts, (void __user *)arg))
+                       return -EFAULT;
+               /* fall through */
+       case ANDROID_ALARM_GET_TIME_COMPAT(0):
+               cmd = ANDROID_ALARM_COMPAT_TO_NORM(cmd);
+               break;
+       }
+
+       rv = alarm_do_ioctl(file, cmd, &ts);
+
+       switch (ANDROID_ALARM_BASE_CMD(cmd)) {
+       case ANDROID_ALARM_GET_TIME(0): /* NOTE: we modified cmd above */
+               if (compat_put_timespec(&ts, (void __user *)arg))
+                       return -EFAULT;
+               break;
+       }
+
+       return rv;
+}
+#endif
 
 static int alarm_open(struct inode *inode, struct file *file)
 {
@@ -355,6 +387,9 @@ static const struct file_operations alarm_fops = {
        .unlocked_ioctl = alarm_ioctl,
        .open = alarm_open,
        .release = alarm_release,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = alarm_compat_ioctl,
+#endif
 };
 
 static struct miscdevice alarm_device = {

diff --git a/drivers/staging/android/android_alarm.h b/drivers/staging/android/android_alarm.h
index d0cafd6..4fd32f3 100644 (file)
--- a/drivers/staging/android/android_alarm.h
+++ b/drivers/staging/android/android_alarm.h
@@ -18,6 +18,7 @@
 
 #include <linux/ioctl.h>
 #include <linux/time.h>
+#include <linux/compat.h>
 
 enum android_alarm_type {
        /* return code bit numbers or set alarm arg */
@@ -59,4 +60,22 @@ enum android_alarm_return_flags {
 #define ANDROID_ALARM_BASE_CMD(cmd)         (cmd & ~(_IOC(0, 0, 0xf0, 0)))
 #define ANDROID_ALARM_IOCTL_TO_TYPE(cmd)    (_IOC_NR(cmd) >> 4)
 
+
+#ifdef CONFIG_COMPAT
+#define ANDROID_ALARM_SET_COMPAT(type)         ALARM_IOW(2, type, \
+                                                       struct compat_timespec)
+#define ANDROID_ALARM_SET_AND_WAIT_COMPAT(type)        ALARM_IOW(3, type, \
+                                                       struct compat_timespec)
+#define ANDROID_ALARM_GET_TIME_COMPAT(type)    ALARM_IOW(4, type, \
+                                                       struct compat_timespec)
+#define ANDROID_ALARM_SET_RTC_COMPAT           _IOW('a', 5, \
+                                                       struct compat_timespec)
+#define ANDROID_ALARM_IOCTL_NR(cmd)            (_IOC_NR(cmd) & ((1<<4)-1))
+#define ANDROID_ALARM_COMPAT_TO_NORM(cmd)  \
+                               ALARM_IOW(ANDROID_ALARM_IOCTL_NR(cmd), \
+                                       ANDROID_ALARM_IOCTL_TO_TYPE(cmd), \
+                                       struct timespec)
+
+#endif
+
 #endif