d13cb97442
Special case for the systemd-logind case in xfree86: when we're vt-switched away and a device is plugged in, we get a paused fd from logind. Since we can't probe the device or do anything with it, we store that device in the xfree86 and handle it later when we vt-switch back. The device is not added to inputInfo.devices until that time. When the device is removed while still vt-switched away, the the config system never notifies the DDX. It only runs through inputInfo.devices and our device was never added to that. When a device is plugged in, removed, and plugged in again while vt-switched away, we have two entries in the xfree86-specific list that refer to the same device node, both pending for addition later. On VT switch back, the first one (the already removed one) will be added successfully, the second one (the still plugged-in one) fails. Since the fd is correct, the device works until it is removed again. The removed devices' config_info (i.e. the syspath) doesn't match the actual device we addded tough (the input number increases with each plug), it doesn't get removed, the fd remains open and we lose track of the fd count. Plugging the device in again leads to a dead device. Fix this by adding a call to notify the DDX to purge any remainders of devices with the given config_info, that's the only identifiable bit we have at this point. https://bugs.freedesktop.org/show_bug.cgi?id=97928 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
152 lines
4.1 KiB
C
152 lines
4.1 KiB
C
/*
|
|
* Copyright © 2006-2007 Daniel Stone
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Author: Daniel Stone <daniel@fooishbar.org>
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <unistd.h>
|
|
#include "os.h"
|
|
#include "inputstr.h"
|
|
#include "hotplug.h"
|
|
#include "config-backends.h"
|
|
#include "systemd-logind.h"
|
|
|
|
void
|
|
config_pre_init(void)
|
|
{
|
|
#ifdef CONFIG_UDEV
|
|
if (!config_udev_pre_init())
|
|
ErrorF("[config] failed to pre-init udev\n");
|
|
#endif
|
|
}
|
|
|
|
void
|
|
config_init(void)
|
|
{
|
|
#ifdef CONFIG_UDEV
|
|
if (!config_udev_init())
|
|
ErrorF("[config] failed to initialise udev\n");
|
|
#elif defined(CONFIG_HAL)
|
|
if (!config_hal_init())
|
|
ErrorF("[config] failed to initialise HAL\n");
|
|
#elif defined(CONFIG_WSCONS)
|
|
if (!config_wscons_init())
|
|
ErrorF("[config] failed to initialise wscons\n");
|
|
#endif
|
|
}
|
|
|
|
void
|
|
config_fini(void)
|
|
{
|
|
#if defined(CONFIG_UDEV)
|
|
config_udev_fini();
|
|
#elif defined(CONFIG_HAL)
|
|
config_hal_fini();
|
|
#elif defined(CONFIG_WSCONS)
|
|
config_wscons_fini();
|
|
#endif
|
|
}
|
|
|
|
void
|
|
config_odev_probe(config_odev_probe_proc_ptr probe_callback)
|
|
{
|
|
#if defined(CONFIG_UDEV_KMS)
|
|
config_udev_odev_probe(probe_callback);
|
|
#endif
|
|
}
|
|
|
|
static void
|
|
remove_device(const char *backend, DeviceIntPtr dev)
|
|
{
|
|
/* this only gets called for devices that have already been added */
|
|
LogMessage(X_INFO, "config/%s: removing device %s\n", backend, dev->name);
|
|
|
|
/* Call PIE here so we don't try to dereference a device that's
|
|
* already been removed. */
|
|
input_lock();
|
|
ProcessInputEvents();
|
|
DeleteInputDeviceRequest(dev);
|
|
input_unlock();
|
|
}
|
|
|
|
void
|
|
remove_devices(const char *backend, const char *config_info)
|
|
{
|
|
DeviceIntPtr dev, next;
|
|
|
|
for (dev = inputInfo.devices; dev; dev = next) {
|
|
next = dev->next;
|
|
if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
|
|
remove_device(backend, dev);
|
|
}
|
|
for (dev = inputInfo.off_devices; dev; dev = next) {
|
|
next = dev->next;
|
|
if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
|
|
remove_device(backend, dev);
|
|
}
|
|
|
|
RemoveInputDeviceTraces(config_info);
|
|
}
|
|
|
|
BOOL
|
|
device_is_duplicate(const char *config_info)
|
|
{
|
|
DeviceIntPtr dev;
|
|
|
|
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
|
if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
|
|
return TRUE;
|
|
}
|
|
|
|
for (dev = inputInfo.off_devices; dev; dev = dev->next) {
|
|
if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
struct OdevAttributes *
|
|
config_odev_allocate_attributes(void)
|
|
{
|
|
struct OdevAttributes *attribs =
|
|
xnfcalloc(1, sizeof (struct OdevAttributes));
|
|
attribs->fd = -1;
|
|
return attribs;
|
|
}
|
|
|
|
void
|
|
config_odev_free_attributes(struct OdevAttributes *attribs)
|
|
{
|
|
if (attribs->fd != -1)
|
|
systemd_logind_release_fd(attribs->major, attribs->minor, attribs->fd);
|
|
free(attribs->path);
|
|
free(attribs->syspath);
|
|
free(attribs->busid);
|
|
free(attribs->driver);
|
|
free(attribs);
|
|
}
|