Received: by 10.192.165.148 with SMTP id m20csp4137832imm; Mon, 30 Apr 2018 12:26:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqaAVM144oh8KS2PGoEYoXpnx2Xbje6teq0/4yICTZUEcAs8Y7CsU9lmmZ9LwpyaKXm/bvK X-Received: by 2002:a17:902:c81:: with SMTP id 1-v6mr13358663plt.126.1525116407131; Mon, 30 Apr 2018 12:26:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525116407; cv=none; d=google.com; s=arc-20160816; b=KxFPpZQCGImQjwnhxsaeubAIjbMNuh3+aPTHP/InVaIesCpykGx8R9ofqAMr8Bfr2J pJLWFgqUH185fUPSynQB3Hr3GM1raGTk/RR0hSlZqKjVJbgJYlct8tNJS8U9fFA1tloD 5N/CBuzIFpdHlYHQHcoIHPib0YLjXML9ibPgUKK/3ER6J4/55Qpk02uYFNPypN2Gt4Pe Ga2rZI4GAFsGziEb9i8orijY7edsKZpIG5dbz0/vR4VDbqHEw9LYtEhxhThunNhUup6/ CDrT8imwii+J4F+OP8CBdVarxs/SIFxFuFvcqzTVSvjgige9W24UomiCiLDJaQvOJd4I lgrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=12DjyQYx9x6g48zhgN96eTBRO99ERo2LX4wJTSzva44=; b=cvhx7HRAcxjb4aEH8bMa9WkwpS/VSMRIJxLdtZV+OkPxljRc8mzzIDv04dRE8buICb wjWJJicpZ1+tePVHM2gfaJ8VNp7hhIy/rFIeL5i3LYs22zdkf7w3YWYdWKvhnrFJlitL MMgd62h5IzxIB+amIFS+OuuLpaUwSwVOk+BJixiMK+zWHTZMLosLf7vZEH/RUSR8EtdC 4Z4NgniZjH43A6rdcMu7C1HT9UjfzJKgEf6wzBJNR50L+ficdY0AdrIqSAqedS+FAtjC vyjWt+XkLXqXhTeDw+OtVULRotYB0mH5hPu8i3CPHi6D4ymnqVR5611eRHjy/X+kihhL VZpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3-v6si7820840plb.536.2018.04.30.12.26.32; Mon, 30 Apr 2018 12:26:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755329AbeD3TZZ (ORCPT + 99 others); Mon, 30 Apr 2018 15:25:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:57764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755194AbeD3TYD (ORCPT ); Mon, 30 Apr 2018 15:24:03 -0400 Received: from localhost (unknown [104.132.1.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0967822DBF; Mon, 30 Apr 2018 19:24:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0967822DBF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan Subject: [PATCH 3.18 05/25] usbip: vhci_hcd: Fix usb device and sockfd leaks Date: Mon, 30 Apr 2018 12:23:12 -0700 Message-Id: <20180430183911.044320032@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430183910.801976983@linuxfoundation.org> References: <20180430183910.801976983@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuah Khan commit 9020a7efe537856eb3e826ebebdf38a5d07a7857 upstream. vhci_hcd fails to do reset to put usb device and sockfd in the module remove/stop paths. Fix the leak. Signed-off-by: Shuah Khan Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/usbip_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/usbip/usbip_common.h +++ b/drivers/usb/usbip/usbip_common.h @@ -248,7 +248,7 @@ enum usbip_side { #define SDEV_EVENT_ERROR_SUBMIT (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) #define SDEV_EVENT_ERROR_MALLOC (USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE) -#define VDEV_EVENT_REMOVED (USBIP_EH_SHUTDOWN | USBIP_EH_BYE) +#define VDEV_EVENT_REMOVED (USBIP_EH_SHUTDOWN | USBIP_EH_RESET | USBIP_EH_BYE) #define VDEV_EVENT_DOWN (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) #define VDEV_EVENT_ERROR_TCP (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) #define VDEV_EVENT_ERROR_MALLOC (USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)