mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
Input: convert drivers to use strict_strtoul()
strict_strtoul() allows newline character at the end of the the input string and therefore is more user-friendly. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
82a196f481
commit
160f1fef7e
6 changed files with 53 additions and 51 deletions
|
@ -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) {
|
||||
|
|
|
@ -157,10 +157,8 @@ static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse, void *data,
|
|||
static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data, const char *buf, size_t count)
|
||||
{
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest || value > 1)
|
||||
if (strict_strtoul(buf, 10, &value) || value > 1)
|
||||
return -EINVAL;
|
||||
|
||||
ps2pp_set_smartscroll(psmouse, value);
|
||||
|
|
|
@ -1433,10 +1433,8 @@ static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const
|
|||
{
|
||||
unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest)
|
||||
if (strict_strtoul(buf, 10, &value))
|
||||
return -EINVAL;
|
||||
|
||||
if ((unsigned int)value != value)
|
||||
|
@ -1549,10 +1547,8 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
|
|||
static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const char *buf, size_t count)
|
||||
{
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest)
|
||||
if (strict_strtoul(buf, 10, &value))
|
||||
return -EINVAL;
|
||||
|
||||
psmouse->set_rate(psmouse, value);
|
||||
|
@ -1562,10 +1558,8 @@ static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const
|
|||
static ssize_t psmouse_attr_set_resolution(struct psmouse *psmouse, void *data, const char *buf, size_t count)
|
||||
{
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest)
|
||||
if (strict_strtoul(buf, 10, &value))
|
||||
return -EINVAL;
|
||||
|
||||
psmouse->set_resolution(psmouse, value);
|
||||
|
|
|
@ -89,10 +89,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,
|
|||
struct trackpoint_attr_data *attr = data;
|
||||
unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest || value > 255)
|
||||
if (strict_strtoul(buf, 10, &value) || value > 255)
|
||||
return -EINVAL;
|
||||
|
||||
*field = value;
|
||||
|
@ -117,10 +115,8 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,
|
|||
struct trackpoint_attr_data *attr = data;
|
||||
unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);
|
||||
unsigned long value;
|
||||
char *rest;
|
||||
|
||||
value = simple_strtoul(buf, &rest, 10);
|
||||
if (*rest || value > 1)
|
||||
if (strict_strtoul(buf, 10, &value) || value > 1)
|
||||
return -EINVAL;
|
||||
|
||||
if (attr->inverted)
|
||||
|
|
|
@ -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;
|
||||
|
||||
aiptek->newSetting.jitterDelay = (int)simple_strtol(buf, NULL, 10);
|
||||
if (strict_strtol(buf, 10, &j))
|
||||
return -EINVAL;
|
||||
|
||||
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;
|
||||
|
||||
aiptek->newSetting.wheel = (int)simple_strtol(buf, NULL, 10);
|
||||
if (strict_strtol(buf, 10, &w)) return -EINVAL;
|
||||
|
||||
aiptek->newSetting.wheel = (int)w;
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
|
@ -461,10 +461,11 @@ static ssize_t ads7846_disable_store(struct device *dev,
|
|||
const char *buf, size_t count)
|
||||
{
|
||||
struct ads7846 *ts = dev_get_drvdata(dev);
|
||||
char *endp;
|
||||
int i;
|
||||
long i;
|
||||
|
||||
if (strict_strtoul(buf, 10, &i))
|
||||
return -EINVAL;
|
||||
|
||||
i = simple_strtoul(buf, &endp, 10);
|
||||
spin_lock_irq(&ts->lock);
|
||||
|
||||
if (i)
|
||||
|
|
Loading…
Reference in a new issue