From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28DB5C43603 for ; Mon, 16 Dec 2019 18:32:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F318F207FF for ; Mon, 16 Dec 2019 18:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576521160; bh=Nkx78TviJHBn+nRU89aAAF3bTfotO+Tkeuar5T2s9Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m1ii3JXKWTa/Qx7ImEaa1FzHu+enmvVOOvagBPudqhb3pdUvh+H36TYSMMbUVflNy k0nmbNEUUuwN0EIEbv77lVVG/KY0HOg0otE0jcSRqQmgeOC+LuPstZkTHZQZ96zwwj 3C7gByH9pN6p3LuA+3wUikBjrln+o5Z6l5IyoA6I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730562AbfLPSce (ORCPT ); Mon, 16 Dec 2019 13:32:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:53100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730311AbfLPSKL (ORCPT ); Mon, 16 Dec 2019 13:10:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 475FB206E0; Mon, 16 Dec 2019 18:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519810; bh=Nkx78TviJHBn+nRU89aAAF3bTfotO+Tkeuar5T2s9Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2qQlAPyD6o4vbDLPxswzlIEYlhxjjNvU3NLMrrVGuVB2zGg59zO/jkt940zifmT6 FO3ACMNj1INGMWAM1KVjCYs414iYO4d0a/AMhu9RZA88FoYBH2azPOX/7JnFlHQNC0 kIRLT724VE+eewNLoPwpC2Ee5C8AUUQzSp46cZm8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Heikki Krogerus , Peter Chen , Hans de Goede , Chunfeng Yun , Suzuki K Poulose , linux-usb@vger.kernel.org Subject: [PATCH 5.3 037/180] usb: roles: fix a potential use after free Date: Mon, 16 Dec 2019 18:47:57 +0100 Message-Id: <20191216174816.176994709@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174806.018988360@linuxfoundation.org> References: <20191216174806.018988360@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Wen Yang commit 1848a543191ae32e558bb0a5974ae7c38ebd86fc upstream. Free the sw structure only after we are done using it. This patch just moves the put_device() down a bit to avoid the use after free. Fixes: 5c54fcac9a9d ("usb: roles: Take care of driver module reference counting") Signed-off-by: Wen Yang Reviewed-by: Heikki Krogerus Reviewed-by: Peter Chen Cc: stable Cc: Hans de Goede Cc: Chunfeng Yun Cc: Suzuki K Poulose Cc: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/r/20191124142236.25671-1-wenyang@linux.alibaba.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/roles/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -144,8 +144,8 @@ EXPORT_SYMBOL_GPL(usb_role_switch_get); void usb_role_switch_put(struct usb_role_switch *sw) { if (!IS_ERR_OR_NULL(sw)) { - put_device(&sw->dev); module_put(sw->dev.parent->driver->owner); + put_device(&sw->dev); } } EXPORT_SYMBOL_GPL(usb_role_switch_put);