pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-02-04 21:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usbredir: Check for existing usb channels after libusb init

Browse Source 
Currently trying to view a usbredir enabled vm from virt-manager causes
virt-manager to crash. This crash is caused by the following happening:

-virt-manager sets up the session, including connecting all the channels
-a spice-gtk internal code path calls spice_usb_device_manager_get()
-spice_usb_device_manager_get calls channel_new on all already connected
 usb channels
-channel_new does:
 spice_usbredir_channel_set_context(SPICE_USBREDIR_CHANNEL(channel),
                                    self->priv->context);
-But self->priv->context has not been set yet (so is NULL) -> segfault!

This patch fixes this by moving the iterating over already connected
usb channels to after the setting of self->priv->context. Note this means
that the channels will no longer get checked when there is no USB_REDIR
support. That is not a problem since spice_usb_device_manager_initable_init
will return FALSE in that case anyways.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2012-03-14 09:41:19 +01:00
parent a8a11db952
commit 434adeb05b
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk/usb-device-manager.c
View File

@ -61,13 +61,6 @@
* spice_usb_device_manager_get() which ensures this 1:1 relation.
*/
/* ------------------------------------------------------------------ */
/* Prototypes for private functions */
static void channel_new(SpiceSession *session, SpiceChannel *channel,
gpointer user_data);
static void channel_destroy(SpiceSession *session, SpiceChannel *channel,
gpointer user_data);
/* ------------------------------------------------------------------ */
/* gobject glue */
@ -109,6 +102,10 @@ struct _SpiceUsbDeviceManagerPrivate {
};
#ifdef USE_USBREDIR
static void channel_new(SpiceSession *session, SpiceChannel *channel,
gpointer user_data);
static void channel_destroy(SpiceSession *session, SpiceChannel *channel,
gpointer user_data);
static void spice_usb_device_manager_uevent_cb(GUdevClient *client,
const gchar *action,
GUdevDevice *udevice,
@ -148,11 +145,11 @@ static gboolean spice_usb_device_manager_initable_init(GInitable *initable,
GCancellable *cancellable,
GError **err)
{
GList *list;
GList *it;
SpiceUsbDeviceManager *self;
SpiceUsbDeviceManagerPrivate *priv;
#ifdef USE_USBREDIR
GList *list;
GList *it;
int rc;
const gchar *const subsystems[] = {"usb", NULL};
#endif
@ -175,6 +172,18 @@ static gboolean spice_usb_device_manager_initable_init(GInitable *initable,
return FALSE;
}
#ifdef USE_USBREDIR
/* Initialize libusb */
rc = libusb_init(&priv->context);
if (rc < 0) {
const char *desc = spice_usbutil_libusb_strerror(rc);
g_warning("Error initializing USB support: %s [%i]", desc, rc);
g_set_error(err, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED,
"Error initializing USB support: %s [%i]", desc, rc);
return FALSE;
}
/* Start listening for usb channels connect/disconnect */
g_signal_connect(priv->session, "channel-new",
G_CALLBACK(channel_new), self);
g_signal_connect(priv->session, "channel-destroy",
@ -185,16 +194,7 @@ static gboolean spice_usb_device_manager_initable_init(GInitable *initable,
}
g_list_free(list);
#ifdef USE_USBREDIR
rc = libusb_init(&priv->context);
if (rc < 0) {
const char *desc = spice_usbutil_libusb_strerror(rc);
g_warning("Error initializing USB support: %s [%i]", desc, rc);
g_set_error(err, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED,
"Error initializing USB support: %s [%i]", desc, rc);
return FALSE;
}
/* Start listening for usb devices plug / unplug */
priv->udev = g_udev_client_new(subsystems);
g_signal_connect(G_OBJECT(priv->udev), "uevent",
G_CALLBACK(spice_usb_device_manager_uevent_cb), self);
@ -460,10 +460,11 @@ static void spice_usb_device_manager_class_init(SpiceUsbDeviceManagerClass *klas
g_type_class_add_private(klass, sizeof(SpiceUsbDeviceManagerPrivate));
}
#ifdef USE_USBREDIR
/* ------------------------------------------------------------------ */
/* gudev / libusb Helper functions */
#ifdef USE_USBREDIR
static gboolean spice_usb_device_manager_get_udev_bus_n_address(
GUdevDevice *udev, int *bus, int *address)
{
@ -480,7 +481,6 @@ static gboolean spice_usb_device_manager_get_udev_bus_n_address(
return *bus && *address;
}
#endif
/* ------------------------------------------------------------------ */
/* callbacks */
@ -491,11 +491,9 @@ static void channel_new(SpiceSession *session, SpiceChannel *channel,
SpiceUsbDeviceManager *self = user_data;
if (SPICE_IS_USBREDIR_CHANNEL(channel)) {
#ifdef USE_USBREDIR
spice_usbredir_channel_set_context(SPICE_USBREDIR_CHANNEL(channel),
self->priv->context);
spice_channel_connect(channel);
#endif
g_ptr_array_add(self->priv->channels, channel);
}
}
@ -509,7 +507,6 @@ static void channel_destroy(SpiceSession *session, SpiceChannel *channel,
g_ptr_array_remove(self->priv->channels, channel);
}
#ifdef USE_USBREDIR
static void spice_usb_device_manager_auto_connect_cb(GObject *gobject,
GAsyncResult *res,
gpointer user_data)