mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-15 05:23:40 +00:00
8dc955bf44
xf86_remove_platform_device() frees the attributes with config_odev_free_attributes(), which gives a server FD back through systemd_logind_release_fd(): a plain close() without a logind session. seatd keeps the device open, and the tracked entry is left pointing at an FD number that can be reused. Close the device through libseat there, next to the logind release. config.c is also linked into the kdrive servers, which never open a device through seatd, so they get an empty stub like the logind ones. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: galternat <galternat.twins223@simplelogin.com>
131 lines
3.7 KiB
C
131 lines
3.7 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>
|
|
*/
|
|
|
|
#include <dix-config.h>
|
|
|
|
#include <stdbool.h>
|
|
#include <unistd.h>
|
|
|
|
#include "config/config-hal.h"
|
|
#include "config/config-udev.h"
|
|
#include "config/config-wscons.h"
|
|
#include "config/hotplug_priv.h"
|
|
|
|
#include "os.h"
|
|
#include "inputstr.h"
|
|
#include "config-backends.h"
|
|
|
|
#include "../hw/xfree86/os-support/linux/systemd-logind.h"
|
|
#include "../hw/xfree86/common/seatd-libseat.h"
|
|
|
|
void
|
|
config_pre_init(void)
|
|
{
|
|
if (!config_udev_pre_init())
|
|
ErrorF("[config] failed to pre-init udev\n");
|
|
}
|
|
|
|
void
|
|
config_init(void)
|
|
{
|
|
if (!config_udev_init())
|
|
ErrorF("[config] failed to initialise udev\n");
|
|
if (!config_hal_init())
|
|
ErrorF("[config] failed to initialise HAL\n");
|
|
if (!config_wscons_init())
|
|
ErrorF("[config] failed to initialise wscons\n");
|
|
}
|
|
|
|
void
|
|
config_fini(void)
|
|
{
|
|
config_udev_fini();
|
|
config_hal_fini();
|
|
config_wscons_fini();
|
|
}
|
|
|
|
void
|
|
config_odev_probe(config_odev_probe_proc_ptr probe_callback)
|
|
{
|
|
#if defined(CONFIG_UDEV) && 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);
|
|
}
|
|
|
|
struct OdevAttributes *
|
|
config_odev_allocate_attributes(void)
|
|
{
|
|
struct OdevAttributes *attribs =
|
|
XNFcallocarray(1, sizeof (struct OdevAttributes));
|
|
attribs->fd = -1;
|
|
return attribs;
|
|
}
|
|
|
|
void
|
|
config_odev_free_attributes(struct OdevAttributes *attribs)
|
|
{
|
|
if (attribs->fd != -1) {
|
|
seatd_libseat_close_graphics(attribs->fd);
|
|
systemd_logind_release_fd(attribs->major, attribs->minor, attribs->fd);
|
|
}
|
|
free(attribs->path);
|
|
free(attribs->syspath);
|
|
free(attribs->busid);
|
|
free(attribs->driver);
|
|
free(attribs);
|
|
}
|