Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
  Input: wm97xx - update email address for Liam Girdwood
  Input: i8042 - add Thinkpad R31 to nomux list
  Input: move map_to_7segment.h to include/linux
  Input: ads7846 - fix cache line sharing issue
  Input: cm109 - add missing newlines to messages
  Input: document i8042.debug in kernel-parameters.txt
  Input: keyboard - fix potential out of bound access to key_map
  Input: psmouse - add OLPC touchpad driver
  Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacks
  Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use of
  Input: psmouse - export psmouse_set_state for ps/2 extensions to use
  Input: ads7846 - introduce .gpio_pendown to get pendown state
  Input: ALPS - add signature for DualPoint found in Dell Latitude E6500
  Input: serio_raw - allow attaching to translated (SERIO_I8042XL) ports
  Input: cm109 - don't use obsolete logging macros
  Input: atkbd - expand Latitude's force release quirk to other Dells
  Input: bf54x-keys - add power management support
  Input: atmel_tsadcc - improve accuracy
  Input: convert drivers to use strict_strtoul()
  Input: appletouch - handle geyser 3/4 status bits
  ...

1 files changed, 38 insertions, 15 deletions

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 8f037a1d44a6..e53c838f1866 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1202,16 +1202,22 @@ static ssize_t
 store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        int x;
+        long x;
+
+        if (strict_strtol(buf, 10, &x)) {
+                size_t len = buf[count - 1] == '\n' ? count - 1 : count;
+
+                if (strncmp(buf, "disable", len))
+                        return -EINVAL;
 
-        if (strcmp(buf, "disable") == 0) {
                 aiptek->newSetting.xTilt = AIPTEK_TILT_DISABLE;
         } else {
-                x = (int)simple_strtol(buf, NULL, 10);
-                if (x >= AIPTEK_TILT_MIN && x <= AIPTEK_TILT_MAX) {
-                        aiptek->newSetting.xTilt = x;
-                }
+                if (x < AIPTEK_TILT_MIN || x > AIPTEK_TILT_MAX)
+                        return -EINVAL;
+
+                aiptek->newSetting.xTilt = x;
         }
+
         return count;
 }
 
@@ -1238,16 +1244,22 @@ static ssize_t
 store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        int y;
+        long y;
+
+        if (strict_strtol(buf, 10, &y)) {
+                size_t len = buf[count - 1] == '\n' ? count - 1 : count;
+
+                if (strncmp(buf, "disable", len))
+                        return -EINVAL;
 
-        if (strcmp(buf, "disable") == 0) {
                 aiptek->newSetting.yTilt = AIPTEK_TILT_DISABLE;
         } else {
-                y = (int)simple_strtol(buf, NULL, 10);
-                if (y >= AIPTEK_TILT_MIN && y <= AIPTEK_TILT_MAX) {
-                        aiptek->newSetting.yTilt = y;
-                }
+                if (y < AIPTEK_TILT_MIN || y > AIPTEK_TILT_MAX)
+                        return -EINVAL;
+
+                aiptek->newSetting.yTilt = y;
         }
+
         return count;
 }
 
@@ -1269,8 +1281,12 @@ static ssize_t
 store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long j;
+
+        if (strict_strtol(buf, 10, &j))
+                return -EINVAL;
 
-        aiptek->newSetting.jitterDelay = (int)simple_strtol(buf, NULL, 10);
+        aiptek->newSetting.jitterDelay = (int)j;
         return count;
 }
 
@@ -1294,8 +1310,12 @@ static ssize_t
 store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long d;
 
-        aiptek->newSetting.programmableDelay = (int)simple_strtol(buf, NULL, 10);
+        if (strict_strtol(buf, 10, &d))
+                return -EINVAL;
+
+        aiptek->newSetting.programmableDelay = (int)d;
         return count;
 }
 
@@ -1541,8 +1561,11 @@ static ssize_t
 store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long w;
+
+        if (strict_strtol(buf, 10, &w)) return -EINVAL;
 
-        aiptek->newSetting.wheel = (int)simple_strtol(buf, NULL, 10);
+        aiptek->newSetting.wheel = (int)w;
         return count;
 }