Change the EVIOC?ABS ioctls to use structs rather than arrays of ints.

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index f6c1efc61ea0f8fc05c5bf70434022ec3e14b23d..c0ee61af624e29741f92bceee579a63a07d15b08 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -233,6 +233,7 @@ static int evdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
        struct evdev_list *list = file->private_data;
        struct evdev *evdev = list->evdev;
        struct input_dev *dev = evdev->handle.dev;
+       struct input_absinfo abs;
        int t, u;
 
        if (!evdev->exist) return -ENODEV;
@@ -378,11 +379,14 @@ static int evdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                                int t = _IOC_NR(cmd) & ABS_MAX;
 
-                               if (put_user(dev->abs[t],     ((int *) arg) + 0)) return -EFAULT;
-                               if (put_user(dev->absmin[t],  ((int *) arg) + 1)) return -EFAULT;
-                               if (put_user(dev->absmax[t],  ((int *) arg) + 2)) return -EFAULT;
-                               if (put_user(dev->absfuzz[t], ((int *) arg) + 3)) return -EFAULT;
-                               if (put_user(dev->absflat[t], ((int *) arg) + 4)) return -EFAULT;
+                               abs.value = dev->abs[t];
+                               abs.minimum = dev->absmin[t];
+                               abs.maximum = dev->absmax[t];
+                               abs.fuzz = dev->absfuzz[t];
+                               abs.flat = dev->absflat[t];
+
+                               if (copy_to_user((void *) arg, &abs, sizeof(struct input_absinfo)))
+                                       return -EFAULT;
 
                                return 0;
                        }
@@ -391,11 +395,14 @@ static int evdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                                int t = _IOC_NR(cmd) & ABS_MAX;
 
-                               if (get_user(dev->abs[t],     ((int *) arg) + 0)) return -EFAULT;
-                               if (get_user(dev->absmin[t],  ((int *) arg) + 1)) return -EFAULT;
-                               if (get_user(dev->absmax[t],  ((int *) arg) + 2)) return -EFAULT;
-                               if (get_user(dev->absfuzz[t], ((int *) arg) + 3)) return -EFAULT;
-                               if (get_user(dev->absflat[t], ((int *) arg) + 4)) return -EFAULT;
+                               if (copy_from_user(&abs, (void *) arg, sizeof(struct input_absinfo)))
+                                       return -EFAULT;
+
+                               dev->abs[t] = abs.value;
+                               dev->absmin[t] = abs.minimum;
+                               dev->absmax[t] = abs.maximum;
+                               dev->absfuzz[t] = abs.fuzz;
+                               dev->absflat[t] = abs.flat;
 
                                return 0;
                        }

diff --git a/include/linux/input.h b/include/linux/input.h
index 2899d6507cd8d2f42f0aa63c88eda1ba89de2552..fe7a4a2d36bb3886ff303176bc6ddee410dd56d7 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -63,6 +63,14 @@ struct input_id {
        __u16 version;
 };
 
+struct input_absinfo {
+       int value;
+       int minimum;
+       int maximum;
+       int fuzz;
+       int flat;
+};
+
 #define EVIOCGVERSION          _IOR('E', 0x01, int)                    /* get driver version */
 #define EVIOCGID               _IOR('E', 0x02, struct input_id)        /* get device ID */
 #define EVIOCGREP              _IOR('E', 0x03, int[2])                 /* get repeat settings */
@@ -79,8 +87,8 @@ struct input_id {
 #define EVIOCGSND(len)         _IOC(_IOC_READ, 'E', 0x1a, len)         /* get all sounds status */
 
 #define EVIOCGBIT(ev,len)      _IOC(_IOC_READ, 'E', 0x20 + ev, len)    /* get event bits */
-#define EVIOCGABS(abs)         _IOR('E', 0x40 + abs, int[5])           /* get abs value/limits */
-#define EVIOCSABS(abs)         _IOW('E', 0xc0 + abs, int[5])           /* set abs value/limits */
+#define EVIOCGABS(abs)         _IOR('E', 0x40 + abs, struct input_absinfo)             /* get abs value/limits */
+#define EVIOCSABS(abs)         _IOW('E', 0xc0 + abs, struct input_absinfo)             /* set abs value/limits */
 
 #define EVIOCSFF               _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))   /* send a force effect to a force feedback device */
 #define EVIOCRMFF              _IOW('E', 0x81, int)                    /* Erase a force effect */