<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""> <div><blockquote type="cite" class=""><div class="">On 5 Feb 2016, at 18:38 PM, Jonathon Jongsma <<a href="mailto:jjongsma@redhat.com" class="">jjongsma@redhat.com</a>> wrote:</div> <div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">On Fri, 2016-02-05 at 10:21 -0600, Jonathon Jongsma wrote:<br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">On Thu, 2016-02-04 at 16:40 -0600, Jonathon Jongsma wrote: <blockquote type="cite" class="">On Thu, 2015-10-29 at 17:26 +0200, Dmitry Fleytman wrote: <blockquote type="cite" class="">Hide rules order UsbDk to avoid showing specific USB devices to Windows PnP manager. Spice-gtk loads hide rules for devices that should be automatically redirected on connection to prevent Windows from showing "New Hardware Found" wizard window for USB devices that do not have driver on the local system. Signed-off-by: Dmitry Fleytman <<a href="mailto:dmitry@daynix.com" class="">dmitry@daynix.com</a>> --- src/usb-device-manager.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c index dd55276..d5fec8f 100644 --- a/src/usb-device-manager.c +++ b/src/usb-device-manager.c @@ -29,6 +29,10 @@ #include <errno.h> #include <libusb.h> +#ifdef G_OS_WIN32 +#include "usbdk_api.h" +#endif + #if defined(USE_GUDEV) #include <gudev/gudev.h> #elif defined(G_OS_WIN32) @@ -121,6 +125,8 @@ struct _SpiceUsbDeviceManagerPrivate { libusb_hotplug_callback_handle hp_handle; #endif #ifdef G_OS_WIN32 + usbdk_api_wrapper *usbdk_api; + HANDLE usbdk_hider_handle; SpiceWinUsbDriver *installer; #endif gboolean use_usbclerk; @@ -183,6 +189,9 @@ static void spice_usb_device_unref(SpiceUsbDevice *device); #ifdef G_OS_WIN32 static guint8 spice_usb_device_get_state(SpiceUsbDevice *device); static void spice_usb_device_set_state(SpiceUsbDevice *device, guint8 s); + +static void _usbdk_autoredir_enable(SpiceUsbDeviceManager *manager); +static void _usbdk_autoredir_disable(SpiceUsbDeviceManager *manager); #endif static gboolean spice_usb_manager_device_equal_libdev(SpiceUsbDeviceManager *manager, @@ -364,6 +373,12 @@ static void spice_usb_device_manager_finalize(GObject *gobject) g_free(priv->auto_connect_filter); g_free(priv->redirect_on_connect); +#ifdef G_OS_WIN32 + if (!priv->use_usbclerk) { + if(priv->auto_connect) + _usbdk_autoredir_disable(self); + } +#endif </blockquote></blockquote> Another thing: Here you introduce this code within an #ifdef G_OS_WIN32 block, but in the next commit, you change this to #if defined(G_OS_WIN32) && defined(USE_USBREDIR) If this change is necessary, it should be done in this commit, not in the next one. But it seems that you could simply move it up a few lines to the block where you unref the priv->installer variable, no? Or is there some reason this has to be done after freeing auto_connect_filter and redirect_on_connect? <blockquote type="cite" class=""><blockquote type="cite" class=""> /* Chain up to the parent class */ if (G_OBJECT_CLASS(spice_usb_device_manager_parent_class)->finalize) G_OBJECT_CLASS(spice_usb_device_manager_parent_class) ->finalize(gobject); @@ -415,6 +430,15 @@ static void spice_usb_device_manager_set_property(GObject *gobject, break; case PROP_AUTO_CONNECT: priv->auto_connect = g_value_get_boolean(value); </blockquote> It does not appear that PROP_AUTO_CONNECT is a construct-only property, so this property could theoretically be called multiple times. From looking at the _usb_autoredir_(en|dis)able() functions below, it doesn't look like a good idea to call them multiple times. In addition, it appears racy since _usbdk_autoredir_enable() depends on redirect_on_connect. If that property is not set before this one, it will return without doing anything. To avoid the race, these calls should probably go into a 'constructed' vfunc. <blockquote type="cite" class="">+#ifdef G_OS_WIN32 + if (!priv->use_usbclerk) { + if (priv->auto_connect) { + _usbdk_autoredir_enable(self); + } else { + _usbdk_autoredir_disable(self); + } + } +#endif break; case PROP_AUTO_CONNECT_FILTER: { const gchar *filter = g_value_get_string(value); @@ -1856,6 +1880,40 @@ guint8 spice_usb_device_get_state(SpiceUsbDevice *device) return info->state; } +static +void _usbdk_autoredir_enable(SpiceUsbDeviceManager *manager) +{ + SpiceUsbDeviceManagerPrivate *priv = manager->priv; + g_return_if_fail(!priv->use_usbclerk); + + if (priv->redirect_on_connect == NULL) { </blockquote> as I said above, if the 'redirect-on-connect' property is not set before 'auto -connect', this function will return without doing anythign and print a debug statement. <blockquote type="cite" class="">+ SPICE_DEBUG("No autoredirect rules, no hider setup needed"); + return; + } + + priv->usbdk_hider_handle = usbdk_create_hider_handle(priv ->usbdk_api); </blockquote> Also, if this function is called multiple times, I think we'll leak the handle here. </blockquote></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">... And now I notice that priv->usbdk_api has not actually been initialized in<br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">this patch. It's not until patch 10 that usbdk_api_load() is called. So this<br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">call will segfault unless these patches are re-ordered so that the api is loaded<br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">before it's used.<br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""></div></blockquote><div> </div><div>This code will not segfault because it protected by if(!use_usbclerk) condition.</div><div>This is by design to make history simpler, we introduce everything step by step</div><div>protected by if(!use_usbclerk) condition which is always false until the last patch that</div><div>sets use_usbclerk = FALSE when UsbDk is available and successfully linked. </div><div> </div><blockquote type="cite" class=""><div class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" class=""> <blockquote type="cite" class="">+ if (priv->usbdk_hider_handle == NULL) { + g_warning("Failed to instantiate UsbDk hider interface"); + return; + } + + usbdk_api_set_hide_rules(priv->usbdk_api, + priv->usbdk_hider_handle, + priv->redirect_on_connect); +} + +static +void _usbdk_autoredir_disable(SpiceUsbDeviceManager *manager) +{ + SpiceUsbDeviceManagerPrivate *priv = manager->priv; + g_return_if_fail(!priv->use_usbclerk); + + if (priv->usbdk_hider_handle != NULL) { + usbdk_clear_hide_rules(priv->usbdk_api, priv ->usbdk_hider_handle); + usbdk_close_hider_handle(priv->usbdk_api, priv ->usbdk_hider_handle); + priv->usbdk_hider_handle = NULL; + } +} #endif static SpiceUsbDevice *spice_usb_device_ref(SpiceUsbDevice *device) </blockquote> Reviewed-by: Jonathon Jongsma <<a href="mailto:jjongsma@redhat.com" class="">jjongsma@redhat.com</a>> _______________________________________________ Spice-devel mailing list <a href="mailto:Spice-devel@lists.freedesktop.org" class="">Spice-devel@lists.freedesktop.org</a> http://lists.freedesktop.org/mailman/listinfo/spice-devel </blockquote>_______________________________________________ Spice-devel mailing list <a href="mailto:Spice-devel@lists.freedesktop.org" class="">Spice-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/spice-devel" class="">http://lists.freedesktop.org/mailman/listinfo/spice-devel</a></blockquote></div></blockquote></div> </body></html>