From patchwork Fri Mar 21 14:37:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Kuchynski X-Patchwork-Id: 875932 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 4FF851D61A2 for ; Fri, 21 Mar 2025 14:38:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742567915; cv=none; b=azQbc1UDFJdcs4Il4tf7NLObeBf7PYAyNsAftAAskSOynBT79unyhyRhv/uIW7uelrGDYz+EnEzZ7r7oeN9Zll5ZIMUz+PQcTJZNjLD57pjmMsqzRujiXcA2oTrpuzAn7KZsQ/2hmqu8Qb786557TVKRL8SnY5dUjZbsDbJRGbQ= 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.51 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-f51.google.com with SMTP id a640c23a62f3a-ac28e66c0e1so316675666b.0 for ; Fri, 21 Mar 2025 07:38:32 -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=SV1zhAHGdb4ig/F7u1OuumtzhvEvJLWx3S7TQ2pWA5MTRF03fjEOdWu1NeAgSs3Y9S Q9swK8UuUdG+T8OU0GJXRXpYwQs9G5C7qnRwTJLQd/RRFkuO8x9Z9iOyEKusw3ubs4dZ 2sTx2jQcXP+ioGwSfqpy1tZyRe7vP/1cSSuGEJIjnWqq/H4+U/g6J2l6t6BjtShT4A+U upECW1TBpzeqJa/6pDnKKhMWauRCXfNCBRMl/Dr500DnpogKGw2trmwbpx4yhODUSPP8 9OvK+WlEJqrX6gn571r7yQsV4NOOVRUFGQuvsfeRjvQT7Slv9LytFigh3r1ZwKcy8ZDZ FufA== X-Forwarded-Encrypted: i=1; AJvYcCWBGpR5rnjHowIyGfQCN4Cj46GBGpta/IAYOVg1Aal8z3rpXQzSAADFUZxJR+rEDHpkZXSgZ8CEsIo=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8XPhd1e0NEiUlTCUcRCSOIe+QR7qOwcnUxqArQ77hJpIc8pxy 6is4WDf/prHQzEGNUgJTvwrBGkbZwQ06Kvf7J3eFt6XCIgOrJD/m1bTxOw0oJLQWj5Rwq7WX4jY I5A== X-Gm-Gg: ASbGncv/for/JKGneo+nQU3OIZa0CyrfnocxaCmGjysAljthxU1/LSe2NFwVgVPPxpq 8ZF386mez+4UWy7Q3HRfTDY12xcEB+NP5I6NGZ22EIC57xsF4AVJzM0ESSLAv9P5sv4gdM+Be3y bexDFVqdClEgHEzUa++ANj2zuHA/iGy2JA6TzEJETzaLgdoRAJY/g3oBitSG2fkDZiX3h5Fg0DT /YfIeCJ+b8rNVXsPcJxTCyLRFN84RhNDgDtEp/C+G/B958xnZi8olj3YsCre0ZGH1nfZmD4+Zl0 fAjt7U1nMIj/C+X6c6Oi+QY6ovWmt2f6xeDmRV1ggh5JEsLXg0GW0cXYJ8WdCfBIefHbWzP9Pys uA4IMfnVS24CgAZfpFuYT+124//ZOA7W5Wh0= 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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 partner") Signed-off-by: Andrei Kuchynski 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 typec_port *port, partner->usb_mode = USB_MODE_USB3; } + mutex_lock(&port->partner_link_lock); ret = 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 typec_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); return partner; } @@ -1083,12 +1085,14 @@ void typec_unregister_partner(struct typec_partner *partner) port = to_typec_port(partner->dev.parent); + 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); device_unregister(&partner->dev); + mutex_unlock(&port->partner_link_lock); } EXPORT_SYMBOL_GPL(typec_unregister_partner); @@ -2041,10 +2045,11 @@ static struct typec_partner *typec_get_partner(struct typec_port *port) static void typec_partner_attach(struct typec_connector *con, struct device *dev) { struct typec_port *port = container_of(con, struct typec_port, con); - struct typec_partner *partner = typec_get_partner(port); + struct typec_partner *partner; struct usb_device *udev = to_usb_device(dev); enum usb_mode usb_mode; + mutex_lock(&port->partner_link_lock); if (udev->speed < USB_SPEED_SUPER) { usb_mode = USB_MODE_USB2; port->usb2_dev = dev; @@ -2053,18 +2058,22 @@ static void typec_partner_attach(struct typec_connector *con, struct device *dev port->usb3_dev = dev; } + partner = 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); } static void typec_partner_deattach(struct typec_connector *con, struct device *dev) { struct typec_port *port = container_of(con, struct typec_port, con); - struct typec_partner *partner = typec_get_partner(port); + struct typec_partner *partner; + mutex_lock(&port->partner_link_lock); + partner = 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_connector *con, struct device *d port->usb2_dev = NULL; else if (port->usb3_dev == dev) port->usb3_dev = NULL; + mutex_unlock(&port->partner_link_lock); } /** @@ -2614,6 +2624,7 @@ struct typec_port *typec_register_port(struct device *parent, ida_init(&port->mode_ids); mutex_init(&port->port_type_lock); + mutex_init(&port->partner_link_lock); port->id = id; port->ops = 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; enum typec_orientation orientation; struct typec_switch *sw; From patchwork Fri Mar 21 14:37:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Kuchynski X-Patchwork-Id: 875478 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 8D49A1D6DC8 for ; Fri, 21 Mar 2025 14:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742567917; cv=none; b=KZl3AlzV9gpHyhPUOlK9nAnh4ssw5cl3O+X4sqUo6PkUan1YKXeXg6p7Cw7+PiuJFAFhxDuKYhnHS0ZgMTVdoY+dtRlu8LvRV0qNr5ux6741/Gw0OSY1l9jcUCRQlV8eVwQdzwo3g3nzKRybSKIMIN7yFu5ApIbfWELljfKJQj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742567917; c=relaxed/simple; bh=somCsdwAZwSYpVOFZ7+NaJb7TDarJS/nC+HR7pvWjx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MLpU7mRwt2sBHgDoljA7cAyl56WosYpoXoP2FoyjXf3w3pImFg3nOenMk9A6CFwwEqqVLKF+AWBB8l8pyLXyXl6Rt3ajUCgvdDVZNhZs3Crey6XvPZlEayNxofiVQmGxKxZic10PYOfHur0UOnIV74sK54r4B7BwtwpRoEBtkLc= 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=IbNbmAJ5; arc=none smtp.client-ip=209.85.218.50 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="IbNbmAJ5" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac29fd22163so370024166b.3 for ; Fri, 21 Mar 2025 07:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1742567914; x=1743172714; 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=YpYeREYD441841zmxzfOu57tf5+TRBtE3JtUo8WB5k8=; b=IbNbmAJ5ndgMTdBDPQ9/jYKcCSeQM3Ag+E8/WYkzwNjF9eIuUp6dWPZaxaTIss7Dry HcKqx3rc9bGYXEgt76+9PchNyD/BJV5paYUxDZQsjvGlcUoD6wgy0AXcMr2fNHqAtmZU 0AajppGLYkfmmIrTttZ6c11pfOIl+YnjDroTU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742567914; x=1743172714; 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=YpYeREYD441841zmxzfOu57tf5+TRBtE3JtUo8WB5k8=; b=LUOZKB37OIegVYl2sitZqS1GqRezQ1C36rr84G/Vmw6MSO+i76HTqtwkDIFVBLh5Wo vBIQHEczlcVHKSmCB/IOOPpr3pZg9TfxYwj2MiHbJPuBYgqjy3HrXJNFMmgTxoWyzLxF 0He6usWWc27nholZRO2iRFcTVF/fFuwcfkoyq5jK7grIO65GcT1y1KxhVz+vRWkoxGyH C+aIlSbWgLEq32J/JB7UQDeoukZCBuYCn35KnEJg6aiUh59dg4G9ShbM+FBO7z84ea0f WtTHIRJm1pb0W+3FJiQdglqGCmxDfQEoyR8MmCeLh/1RIeeMFjLATRPtKeF6hCEfYgd4 h7Zw== X-Forwarded-Encrypted: i=1; AJvYcCUhe9YkPIwUP92ItovRuXewToZq/emjsucTxl96kz02keW63ZerZiW+AAiXEqjyvI6oxt3iyR/udiA=@vger.kernel.org X-Gm-Message-State: AOJu0YwB/9PyLL76i/pLxW96fbZdtOfY9vQMFrJSEbfBiJMB1d89o3Qg djwFdDcltbeh5ap44fHBJc0H1A+/JGzGHgi5lJBFaot+hQQHJZm1LaVfVURing== X-Gm-Gg: ASbGncvdLLaHq05JAbINcJQ1f9nE9OtJZEC1YQ5fwE+oYhiuzTYq1sVrvHL6PiGyBWH Ys/MSE8C0z9u5Y3eO6Bn8Zt6Fy+wRuwVV1JyjWaw3wEkEBVUu9EgVn57biLpLtJ4gG8n00XwyzB C8GeTsB/oScToQQ6m2RTAo2BaFCoYQkFOcbJNDAGkmYWrFmnnEVyUosKoOOPyOeg5A3mknzfF3X 2YwtOqwvkro5SXiPg7r7H4JuMkrC6C6mK6IUdGEoYD9iddZa6FJBvWUNSsZ6DVXIJLpzabd1KUP AYp3gWO9Sw3nPSP3NetxyREK88kwkxRItVMBrsDTHyKb27fCw+/U0+Q1bS+nW+Xaxdk+uUrCV6H L45lSMB3WTDeykiiTCEVn9r9cMRjM6jyf22M= X-Google-Smtp-Source: AGHT+IFx6Z5++sXoujB2L8zFX/kIAOeEopfZFF9EvYWaukAV92ezO0xWR/S1jldFyiEhLEo4ae0bLg== X-Received: by 2002:a17:907:3fa3:b0:ac3:bf36:80e2 with SMTP id a640c23a62f3a-ac3f211183amr353993066b.20.1742567913806; Fri, 21 Mar 2025 07:38:33 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 07:38:33 -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 2/2] usb: typec: class: Invalidate USB device pointers on partner unregistration Date: Fri, 21 Mar 2025 14:37:27 +0000 Message-ID: <20250321143728.4092417-3-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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To avoid using invalid USB device pointers after a Type-C partner disconnects, this patch clears the pointers upon partner unregistration. This ensures a clean state for future connections. Cc: stable@vger.kernel.org Fixes: 59de2a56d127 ("usb: typec: Link enumerated USB devices with Type-C partner") Signed-off-by: Andrei Kuchynski Reviewed-by: Benson Leung Reviewed-by: Heikki Krogerus --- drivers/usb/typec/class.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index eadb150223f8..3df3e3736916 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -1086,10 +1086,14 @@ void typec_unregister_partner(struct typec_partner *partner) port = to_typec_port(partner->dev.parent); mutex_lock(&port->partner_link_lock); - if (port->usb2_dev) + if (port->usb2_dev) { typec_partner_unlink_device(partner, port->usb2_dev); - if (port->usb3_dev) + port->usb2_dev = NULL; + } + if (port->usb3_dev) { typec_partner_unlink_device(partner, port->usb3_dev); + port->usb3_dev = NULL; + } device_unregister(&partner->dev); mutex_unlock(&port->partner_link_lock);