From patchwork Sun Feb 26 15:14:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 143090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BD701B6F98 for ; Mon, 27 Feb 2012 02:13:24 +1100 (EST) Received: from localhost ([::1]:48449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fmr-0007wj-OJ for incoming@patchwork.ozlabs.org; Sun, 26 Feb 2012 10:13:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fmf-0007qO-OR for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S1fme-0001qv-Go for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fme-0001qi-96 for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:08 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1QFD7Hs022172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Feb 2012 10:13:07 -0500 Received: from shalem.localdomain.com (vpn1-7-62.ams2.redhat.com [10.36.7.62]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q1QFD4Gb005987; Sun, 26 Feb 2012 10:13:06 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Sun, 26 Feb 2012 16:14:44 +0100 Message-Id: <1330269288-5578-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1330269288-5578-1-git-send-email-hdegoede@redhat.com> References: <1330269288-5578-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/6] usb-redir: Always clear device state on filter reject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- usb-redir.c | 11 +++++++---- 1 files 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); } } }