Commit 66021cdf authored Nov 26, 2019 by Wen Yang Committed by Greg Kroah-Hartman Dec 17, 2019

usb: typec: fix use after free in typec_register_port()



[ Upstream commit 5c388abefda0d92355714010c0199055c57ab6c7 ]

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 <wenyang@linux.alibaba.com>
Cc: stable <stable@vger.kernel.org>
Cc: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Heikki <Krogerus &lt;heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20191126140452.14048-1-wenyang@linux.alibaba.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d03d9633

drivers/usb/typec/class.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1589,14 +1589,16 @@ struct typec_port typec_register_port(struct device parent,

		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, "typec-mux");
		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);