Skip to content

L
linux
Commit 41e979f8 authored by Vojtech Pavlik's avatar Vojtech Pavlik Committed by Dmitry Torokhov
Browse files
Options

Input: Make EVIOSCSABS work in evdev. 

Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent bef3768d
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 199 deletions
drivers/input/evdev.c
View file @ 41e979f8
......@@ -371,9 +371,11 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
default:
if (_IOC_TYPE(cmd) != 'E' || _IOC_DIR(cmd) != _IOC_READ)
if (_IOC_TYPE(cmd) != 'E')
return -EINVAL;
if (_IOC_DIR(cmd) == _IOC_READ) {
if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {
long *bits;
......@@ -456,6 +458,10 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return 0;
}
}
if (_IOC_DIR(cmd) == _IOC_WRITE) {
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {
int t = _IOC_NR(cmd) & ABS_MAX;
......@@ -472,6 +478,7 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return 0;
}
}
}
return -EINVAL;
}
......@@ -484,6 +491,28 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
#define LONG_COMPAT(x) ((x)/BITS_PER_LONG_COMPAT)
#define test_bit_compat(bit, array) ((array[LONG_COMPAT(bit)] >> OFF_COMPAT(bit)) & 1)
#ifdef __BIG_ENDIAN
#define bit_to_user(bit, max) \
do { \
int i; \
int len = NBITS_COMPAT((max)) * sizeof(compat_long_t); \
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); \
for (i = 0; i < len / sizeof(compat_long_t); i++) \
if (copy_to_user((compat_long_t*) p + i, \
(compat_long_t*) (bit) + i + 1 - ((i % 2) << 1), \
sizeof(compat_long_t))) \
return -EFAULT; \
return len; \
} while (0)
#else
#define bit_to_user(bit, max) \
do { \
int len = NBITS_COMPAT((max)) * sizeof(compat_long_t); \
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); \
return copy_to_user(p, (bit), len) ? -EFAULT : len; \
} while (0)
#endif
static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
{
struct evdev_list *list = file->private_data;
......@@ -491,9 +520,6 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
struct input_dev *dev = evdev->handle.dev;
struct input_absinfo abs;
void __user *p = compat_ptr(arg);
#ifdef __BIG_ENDIAN
int i;
#endif
if (!evdev->exist) return -ENODEV;
......@@ -511,86 +537,37 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
default:
if (_IOC_TYPE(cmd) != 'E' || _IOC_DIR(cmd) != _IOC_READ)
if (_IOC_TYPE(cmd) != 'E')
return -EINVAL;
if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {
if (_IOC_DIR(cmd) == _IOC_READ) {
if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {
long *bits;
int len;
int max;
switch (_IOC_NR(cmd) & EV_MAX) {
case 0: bits = dev->evbit; len = EV_MAX; break;
case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;
case EV_REL: bits = dev->relbit; len = REL_MAX; break;
case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;
case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;
case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
case EV_FF: bits = dev->ffbit; len = FF_MAX; break;
case 0: bits = dev->evbit; max = EV_MAX; break;
case EV_KEY: bits = dev->keybit; max = KEY_MAX; break;
case EV_REL: bits = dev->relbit; max = REL_MAX; break;
case EV_ABS: bits = dev->absbit; max = ABS_MAX; break;
case EV_MSC: bits = dev->mscbit; max = MSC_MAX; break;
case EV_LED: bits = dev->ledbit; max = LED_MAX; break;
case EV_SND: bits = dev->sndbit; max = SND_MAX; break;
case EV_FF: bits = dev->ffbit; max = FF_MAX; break;
default: return -EINVAL;
}
len = NBITS_COMPAT(len) * sizeof(compat_long_t);
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
#ifdef __BIG_ENDIAN
for (i = 0; i < len / sizeof(compat_long_t); i++)
if (copy_to_user((compat_long_t*) p + i,
(compat_long_t*) bits + i + 1 - ((i % 2) << 1),
sizeof(compat_long_t)))
return -EFAULT;
return len;
#else
return copy_to_user(p, bits, len) ? -EFAULT : len;
#endif
bit_to_user(bits, max);
}
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0))) {
int len;
len = NBITS_COMPAT(KEY_MAX) * sizeof(compat_long_t);
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
#ifdef __BIG_ENDIAN
for (i = 0; i < len / sizeof(compat_long_t); i++)
if (copy_to_user((compat_long_t*) p + i,
(compat_long_t*) dev->key + i + 1 - ((i % 2) << 1),
sizeof(compat_long_t)))
return -EFAULT;
return len;
#else
return copy_to_user(p, dev->key, len) ? -EFAULT : len;
#endif
}
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0)))
bit_to_user(dev->key, KEY_MAX);
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGLED(0))) {
int len;
len = NBITS_COMPAT(LED_MAX) * sizeof(compat_long_t);
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
#ifdef __BIG_ENDIAN
for (i = 0; i < len / sizeof(compat_long_t); i++)
if (copy_to_user((compat_long_t*) p + i,
(compat_long_t*) dev->led + i + 1 - ((i % 2) << 1),
sizeof(compat_long_t)))
return -EFAULT;
return len;
#else
return copy_to_user(p, dev->led, len) ? -EFAULT : len;
#endif
}
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGLED(0)))
bit_to_user(dev->led, LED_MAX);
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSND(0))) {
int len;
len = NBITS_COMPAT(SND_MAX) * sizeof(compat_long_t);
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
#ifdef __BIG_ENDIAN
for (i = 0; i < len / sizeof(compat_long_t); i++)
if (copy_to_user((compat_long_t*) p + i,
(compat_long_t*) dev->snd + i + 1 - ((i % 2) << 1),
sizeof(compat_long_t)))
return -EFAULT;
return len;
#else
return copy_to_user(p, dev->snd, len) ? -EFAULT : len;
#endif
}
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSND(0)))
bit_to_user(dev->snd, SND_MAX);
if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0))) {
int len;
......@@ -631,6 +608,9 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
return 0;
}
}
if (_IOC_DIR(cmd) == _IOC_WRITE) {
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {
......@@ -648,6 +628,7 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
return 0;
}
}
}
return -EINVAL;
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7