From patchwork Mon Dec 16 17:47:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 11294987 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 212B7109A 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 F28E0206EC 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 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); From patchwork Mon Dec 16 17:48:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 11295037 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB361109A for ; Mon, 16 Dec 2019 18:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7C2121835 for ; Mon, 16 Dec 2019 18:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576521263; bh=zJJttVOwLrFq9aZgonSL2Bb1IaAF8YNWFphhjZylzC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gzd5U744fnPIzJCMRUdP2JljVShqcyitIzYNDeDL6yCSVQ4crUGkQm1tYfounAG1/ i32lQ+z4RXE1ashm7F9JauPu1nVvww2NLYaP2go6ksfNzk32CbsckJdOeSTgAqPvrw NUGt+uHUwy8xmkJedSU3P+XzzXfiOCtyQMo9/JRA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730383AbfLPSJM (ORCPT ); Mon, 16 Dec 2019 13:09:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:51244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730381AbfLPSJK (ORCPT ); Mon, 16 Dec 2019 13:09:10 -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 A09882072B; Mon, 16 Dec 2019 18:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519750; bh=zJJttVOwLrFq9aZgonSL2Bb1IaAF8YNWFphhjZylzC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1HT1EImWob1Q8ywOwB17CTCmpGCoQkvtBLqM9fYTKwOEFL6bcx4jTm0Drf4xnNzhL ILcius4OGcmDBO+MlaI6HvM/7egpTBBBAAE4z3JGhwOpjLCKSnlnO2tD+S41Uk8Ylt qygSyQykJ7dyB9eLAGAZo+x3RfHnUHSnu1lUlLvQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , linux-usb@vger.kernel.org, =?utf-8?q?Heikki_Krogerus=C2=A0?= Subject: [PATCH 5.3 053/180] usb: typec: fix use after free in typec_register_port() Date: Mon, 16 Dec 2019 18:48:13 +0100 Message-Id: <20191216174824.725793396@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 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Wen Yang commit 5c388abefda0d92355714010c0199055c57ab6c7 upstream. We can't use "port->sw" and/or "port->mux" after it has been freed. Fixes: 23481121c81d ("usb: typec: class: Don't use port parent for getting mux handles") Signed-off-by: Wen Yang Cc: stable Cc: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org Acked-by: Heikki Krogerus  Link: https://lore.kernel.org/r/20191126140452.14048-1-wenyang@linux.alibaba.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/class.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -1604,14 +1604,16 @@ struct typec_port *typec_register_port(s port->sw = typec_switch_get(&port->dev); if (IS_ERR(port->sw)) { + ret = PTR_ERR(port->sw); put_device(&port->dev); - return ERR_CAST(port->sw); + return ERR_PTR(ret); } port->mux = typec_mux_get(&port->dev, NULL); if (IS_ERR(port->mux)) { + ret = PTR_ERR(port->mux); put_device(&port->dev); - return ERR_CAST(port->mux); + return ERR_PTR(ret); } ret = device_add(&port->dev);