Commit 97cb7dde authored by Brendan Shanks's avatar Brendan Shanks Committed by Khalid Elmously

Input: evdev - call input_flush_device() on release(), not flush()

BugLink: https://bugs.launchpad.net/bugs/1883917

[ Upstream commit 09264098 ]

input_flush_device() should only be called once the struct file is being
released and no open descriptors remain, but evdev_flush() was calling
it whenever a file descriptor was closed.

This caused uploaded force-feedback effects to be erased when a process
did a dup()/close() on the event FD, called system(), etc.

Call input_flush_device() from evdev_release() instead.
Reported-by: default avatarMathieu Maret <mathieu.maret@gmail.com>
Signed-off-by: default avatarBrendan Shanks <bshanks@codeweavers.com>
Link: https://lore.kernel.org/r/20200421231003.7935-1-bshanks@codeweavers.com
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent d298f23f
...@@ -342,20 +342,6 @@ static int evdev_fasync(int fd, struct file *file, int on) ...@@ -342,20 +342,6 @@ static int evdev_fasync(int fd, struct file *file, int on)
return fasync_helper(fd, file, on, &client->fasync); return fasync_helper(fd, file, on, &client->fasync);
} }
static int evdev_flush(struct file *file, fl_owner_t id)
{
struct evdev_client *client = file->private_data;
struct evdev *evdev = client->evdev;
mutex_lock(&evdev->mutex);
if (evdev->exist && !client->revoked)
input_flush_device(&evdev->handle, file);
mutex_unlock(&evdev->mutex);
return 0;
}
static void evdev_free(struct device *dev) static void evdev_free(struct device *dev)
{ {
struct evdev *evdev = container_of(dev, struct evdev, dev); struct evdev *evdev = container_of(dev, struct evdev, dev);
...@@ -469,6 +455,10 @@ static int evdev_release(struct inode *inode, struct file *file) ...@@ -469,6 +455,10 @@ static int evdev_release(struct inode *inode, struct file *file)
unsigned int i; unsigned int i;
mutex_lock(&evdev->mutex); mutex_lock(&evdev->mutex);
if (evdev->exist && !client->revoked)
input_flush_device(&evdev->handle, file);
evdev_ungrab(evdev, client); evdev_ungrab(evdev, client);
mutex_unlock(&evdev->mutex); mutex_unlock(&evdev->mutex);
...@@ -1331,7 +1321,6 @@ static const struct file_operations evdev_fops = { ...@@ -1331,7 +1321,6 @@ static const struct file_operations evdev_fops = {
.compat_ioctl = evdev_ioctl_compat, .compat_ioctl = evdev_ioctl_compat,
#endif #endif
.fasync = evdev_fasync, .fasync = evdev_fasync,
.flush = evdev_flush,
.llseek = no_llseek, .llseek = no_llseek,
}; };
......
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