From nobody Wed Dec 17 12:07:06 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49F831C5D76 for ; Fri, 21 Mar 2025 14:38:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742567915; cv=none; b=me83RBuPAMXOrxfESaf3Lnu46zoa8Mz66ljvjGEg/3J0Ck0qasafImQgYIvufcQOS75Mipuw5UjnWkQLJdjRRRzTGdlmoHopxpf5pEg7X5HJaF7pofcGbrlsu9vLfCNK3hC7OoNKi8+pXXHoTEzQYlv25FRA9l9bfyx8X8CAgoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742567915; c=relaxed/simple; bh=LHadlXEBY0RJqphizh74S6xIrnVqPwoW2mXBiPwoWbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PIvkQVXxVNHF4tqZiJwccQppxQftAhsEEzKM+XXcaLOb166em9auXIJZQ7FfZ4Y0QDXK8xtG3ULURG8k0y89Le5G8xIPAVpBdYA+SVD/ACTPA7sHnMiPQBdLJc3/Fb/eR/EXX5Xo5Pb1JZGzy3ycBwshkzoCuaGc2pqkDHxy0IE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Jlxx5N8T; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Jlxx5N8T" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-aaee2c5ee6eso353063466b.1 for ; Fri, 21 Mar 2025 07:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1742567911; x=1743172711; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gKF4B5xhWhYwRHI0OYv6HEkOpn9LJElh+TkLEa7DhHM=; b=Jlxx5N8TU7cdrB/Zo+2AwEwfXuVYoxLrREkWMEgTkWMqcKsj2donMWvyveD5qHD1nY /HWoCNUZAbg/vNVUTuINSQHLbbhBKhE5aLr+9tSPlGEIYh0vmepYO2aHpRfTnvNIW6hO CR7QNhKiFpcRCCIDIqDPPh2NlEVoM/EaEn9kw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742567911; x=1743172711; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gKF4B5xhWhYwRHI0OYv6HEkOpn9LJElh+TkLEa7DhHM=; b=UeiI+rALV8B3uiM5kKe8MHQMNBWJB+pHkK4P9H42dmSWl5V9voOtkRsF4p1W+UTeVf UOwiOjdK1KdmTC+5M54TZXoBvlec2FqeP0nL02Jj5e5OOCCJq3QOXztQm1eHcA5hbGi7 gmSHqAj3nMDd0L1iroq8ZuMTzug5Z7Do1rrvDyZpiIU/q5Cg2S5r6RevxlEKHV0ZLogZ 9S5n40EAR/jG7DBbZMdAOG5QUu3/YyCkGCXOCP6aR1Qy8uTX/YjmESG9uWLT9DPo8s8i bxWxinC49zDpoYPoM7Oc3s8hmPzDG4FEybBo2kYVcjgr+mDW6nZ/vdKzilmSoE6mDSTQ 5qFA== X-Forwarded-Encrypted: i=1; AJvYcCVnbhUTHCVT30jxmMHzmoMy+ugPkZPS/BmfBNhCFEfeKYeFh9VR1Ko/dLdhF4e1mvNjzYfLoIXW+jqFqPI=@vger.kernel.org X-Gm-Message-State: AOJu0YwFiJ8P+N8wiuorOdgVMTJx3/w2LLIMPpAIuS5drWIzibNmZZLA RaGKY4IFBge5wVCDL/lTJHQ1klZW6lFx/JNoQT0QnHGsGdzaDM3ATvq1+mA5jw== X-Gm-Gg: ASbGncsbJPx1PIEySkcL3amL+olaRTCL1Ukcuax5dz9vU2BjjJrkAxoQ1UqrnWf+xc1 XVkCEnAn8VO9Xl9t8QAeIvl1KkhTmd3V0lV3c7kcJZoO+cG9nJIDZw087ZpxJnJ47OJnv2bRmju JEw5aEFur5LvhiNo+hTxG6wUn3itP+bUeo5u/DDhjJXBa0m5NMt20OLvSgurju6DhIg35pAoXA1 fWRsLek2BDcke41FfTvTc4UqJLJRF/apubsgDPjMOCDFU3Wy1QQtAQPi0aTu076FpMw4q3mXoov rzqZvhjmNkWTO6E956oFKNQK7i3eFj8+X/6uByR/5Ei1seoe+jyUpzITSeHqdfccprJ3+/RE+s4 JHbapk8rco4RkUOlJ1eZtrsLpuJGraL/fxOk= X-Google-Smtp-Source: AGHT+IFpuiiFmVMjocZ1fI0j1MUodJptENZgY17uK77vP78UE9/ca5hL6ArbUbHVzIv5T7omt9klgg== X-Received: by 2002:a17:907:3f21:b0:ac3:8537:904e with SMTP id a640c23a62f3a-ac3f251f2b6mr326382966b.49.1742567911535; Fri, 21 Mar 2025 07:38:31 -0700 (PDT) Received: from akuchynski.c.googlers.com.com (140.20.91.34.bc.googleusercontent.com. [34.91.20.140]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3ef8d3d43sm165303566b.51.2025.03.21.07.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 07:38:31 -0700 (PDT) From: Andrei Kuchynski To: Heikki Krogerus , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Benson Leung , Jameson Thies , Andrei Kuchynski , stable@vger.kernel.org Subject: [PATCH 1/2] usb: typec: class: Fix NULL pointer access Date: Fri, 21 Mar 2025 14:37:26 +0000 Message-ID: <20250321143728.4092417-2-akuchynski@chromium.org> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog In-Reply-To: <20250321143728.4092417-1-akuchynski@chromium.org> References: <20250321143728.4092417-1-akuchynski@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Concurrent calls to typec_partner_unlink_device can lead to a NULL pointer dereference. This patch adds a mutex to protect USB device pointers and prevent this issue. The same mutex protects both the device pointers and the partner device registration. Cc: stable@vger.kernel.org Fixes: 59de2a56d127 ("usb: typec: Link enumerated USB devices with Type-C p= artner") =20 Signed-off-by: Andrei Kuchynski Reviewed-by: Benson Leung Reviewed-by: Heikki Krogerus --- drivers/usb/typec/class.c | 15 +++++++++++++-- drivers/usb/typec/class.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 9c76c3d0c6cf..eadb150223f8 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -1052,6 +1052,7 @@ struct typec_partner *typec_register_partner(struct t= ypec_port *port, partner->usb_mode =3D USB_MODE_USB3; } =20 + mutex_lock(&port->partner_link_lock); ret =3D device_register(&partner->dev); if (ret) { dev_err(&port->dev, "failed to register partner (%d)\n", ret); @@ -1063,6 +1064,7 @@ struct typec_partner *typec_register_partner(struct t= ypec_port *port, typec_partner_link_device(partner, port->usb2_dev); if (port->usb3_dev) typec_partner_link_device(partner, port->usb3_dev); + mutex_unlock(&port->partner_link_lock); =20 return partner; } @@ -1083,12 +1085,14 @@ void typec_unregister_partner(struct typec_partner = *partner) =20 port =3D to_typec_port(partner->dev.parent); =20 + mutex_lock(&port->partner_link_lock); if (port->usb2_dev) typec_partner_unlink_device(partner, port->usb2_dev); if (port->usb3_dev) typec_partner_unlink_device(partner, port->usb3_dev); =20 device_unregister(&partner->dev); + mutex_unlock(&port->partner_link_lock); } EXPORT_SYMBOL_GPL(typec_unregister_partner); =20 @@ -2041,10 +2045,11 @@ static struct typec_partner *typec_get_partner(stru= ct typec_port *port) static void typec_partner_attach(struct typec_connector *con, struct devic= e *dev) { struct typec_port *port =3D container_of(con, struct typec_port, con); - struct typec_partner *partner =3D typec_get_partner(port); + struct typec_partner *partner; struct usb_device *udev =3D to_usb_device(dev); enum usb_mode usb_mode; =20 + mutex_lock(&port->partner_link_lock); if (udev->speed < USB_SPEED_SUPER) { usb_mode =3D USB_MODE_USB2; port->usb2_dev =3D dev; @@ -2053,18 +2058,22 @@ static void typec_partner_attach(struct typec_conne= ctor *con, struct device *dev port->usb3_dev =3D dev; } =20 + partner =3D typec_get_partner(port); if (partner) { typec_partner_set_usb_mode(partner, usb_mode); typec_partner_link_device(partner, dev); put_device(&partner->dev); } + mutex_unlock(&port->partner_link_lock); } =20 static void typec_partner_deattach(struct typec_connector *con, struct dev= ice *dev) { struct typec_port *port =3D container_of(con, struct typec_port, con); - struct typec_partner *partner =3D typec_get_partner(port); + struct typec_partner *partner; =20 + mutex_lock(&port->partner_link_lock); + partner =3D typec_get_partner(port); if (partner) { typec_partner_unlink_device(partner, dev); put_device(&partner->dev); @@ -2074,6 +2083,7 @@ static void typec_partner_deattach(struct typec_conne= ctor *con, struct device *d port->usb2_dev =3D NULL; else if (port->usb3_dev =3D=3D dev) port->usb3_dev =3D NULL; + mutex_unlock(&port->partner_link_lock); } =20 /** @@ -2614,6 +2624,7 @@ struct typec_port *typec_register_port(struct device = *parent, =20 ida_init(&port->mode_ids); mutex_init(&port->port_type_lock); + mutex_init(&port->partner_link_lock); =20 port->id =3D id; port->ops =3D cap->ops; diff --git a/drivers/usb/typec/class.h b/drivers/usb/typec/class.h index b3076a24ad2e..db2fe96c48ff 100644 --- a/drivers/usb/typec/class.h +++ b/drivers/usb/typec/class.h @@ -59,6 +59,7 @@ struct typec_port { enum typec_port_type port_type; enum usb_mode usb_mode; struct mutex port_type_lock; + struct mutex partner_link_lock; =20 enum typec_orientation orientation; struct typec_switch *sw; --=20 2.49.0.395.g12beb8f557-goog