1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index b1ce10f50bcf..44745727aea6 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1207,15 +1207,13 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_extra, old_set;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->extra != value) {
@@ -1264,12 +1262,10 @@ static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t cou
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_scroll;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->scroll != value) {
@@ -1310,15 +1306,13 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_set, old_extra;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || (value != 2 && value != 3))
+        if (strict_strtoul(buf, 10, &value) || (value != 2 && value != 3))
                 return -EINVAL;
 
         if (atkbd->set != value) {
@@ -1361,15 +1355,13 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softrepeat, old_softraw;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softrepeat != value) {
@@ -1413,12 +1405,10 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softraw;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softraw != value) {