From 49a01afb24b925de97074d093fb072bb7de470f9 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Sat, 18 Feb 2012 09:18:57 +0100

Subject: [PATCH 122/140] usb-redir: Always clear device state on filter

 reject

Always call usbredir_device_disconnect() when usbredir_check_filter() fails

to clean up all the device state (ie received endpoint info).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 usb-redir.c |   11 +++++++----

 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usb-redir.c b/usb-redir.c

index 9b804e9..fe3b0a3 100644

--- a/usb-redir.c

+++ b/usb-redir.c

@@ -985,7 +985,7 @@ static int usbredir_check_filter(USBRedirDevice *dev)

 {

     if (dev->interface_info.interface_count == 0) {

         ERROR("No interface info for device\n");

-        return -1;

+        goto error;

     }

     if (dev->filter_rules) {

@@ -993,7 +993,7 @@ static int usbredir_check_filter(USBRedirDevice *dev)

                                     usb_redir_cap_connect_device_version)) {

             ERROR("Device filter specified and peer does not have the "

                   "connect_device_version capability\n");

-            return -1;

+            goto error;

         }

         if (usbredirfilter_check(

@@ -1010,11 +1010,15 @@ static int usbredir_check_filter(USBRedirDevice *dev)

                 dev->device_info.product_id,

                 dev->device_info.device_version_bcd,

                 0) != 0) {

-            return -1;

+            goto error;

         }

     }

     return 0;

+

+error:

+    usbredir_device_disconnect(dev);

+    return -1;

 }

 /*

@@ -1140,7 +1144,6 @@ static void usbredir_interface_info(void *priv,

         if (usbredir_check_filter(dev)) {

             ERROR("Device no longer matches filter after interface info "

                   "change, disconnecting!\n");

-            usbredir_device_disconnect(dev);

         }

     }

 }

-- 

1.7.9.3