From nobody Fri Dec 19 04:27:40 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (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 B1345264F8A for ; Wed, 9 Apr 2025 14:02:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744207359; cv=none; b=IcNDWqu50XV0G5j0pxAKt38WDe/zw2jM+SO0nzFflKtMt6MuPy5XImXJvl6+YX36z0Bryf5+QMuqMkXCqS4cBDkpxTZDwELOoqU8EKM7EF9xTMXwhd1FoC5/ztIRe4l95y7u0jK/hA2HhJdqxmBfMKectoLwEqguewKDVFAYhjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744207359; c=relaxed/simple; bh=iFyXqVFXEULPsNSqQwDUF2/Adtt/V3zIh9vrgqGq5bc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DydT5RAHyWls/Z4p0fXP3JZlOy0fDav/COWaC8iL+cvFOXyoe19oOksxsAC0lr2QC3dsxboK2ADsLazfwc4Mf9rF1Smg6ZF5Tz6bTw33vqV1YSYKp3fSWcAPgpuiNW7mFlZGa6UxNA2omVbFJ3B0qcyI3VpM+JINWLn08ZrQMos= 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=nL8SGc+4; arc=none smtp.client-ip=209.85.218.48 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="nL8SGc+4" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-ac29fd22163so1197361766b.3 for ; Wed, 09 Apr 2025 07:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1744207356; x=1744812156; 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=E5bQBdzdrrxAwjVcMoSn7R6YHyOz0D1Ji82aPtHYgp0=; b=nL8SGc+4dlyVuEapohvoPNZ7JPue1fzj9JSh9l4rQb763aOMiRYsXH/YJKlmcGTzGJ mAckIn+QgZSjm9MJMd+CQKRLvNqXgzKnV+iCX+w15eEC8iR2zp4boAeFiWSMArIQDOXM vO9tGpogD2TWWjj6mKFwNQuhOJtHgk2haOixM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744207356; x=1744812156; 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=E5bQBdzdrrxAwjVcMoSn7R6YHyOz0D1Ji82aPtHYgp0=; b=I8G6VZ8rudCwaVRyowCM1EQYrxY+PnQmvem2RVFZ7qEO4Y/5lDAnkpjZvd2WE3/sxT brcfjNg3RpGLQA07UegiNVKsOSb5MsWNpRaL4oCPa54pJQq/Dm5DallGzsoylNW12OnU RtkE2IZAVuOLqd6B1CfkCPAO1Pm6CeVoyDbxnp9fa49zvJv10wCpr4lMQky5NLJ5sviP 2E4U7xpb4voNRc7MP1AE9RRitS04aNF943Gbudcyi6LMPGmHMzXCeGa7j0qv8/rfzkHX HHNg3ExbHvAozOIT/TETXeS0YI9nsW5vrwEqu8HBjx2Erd6fe5BbflyErnK4j0blQrNo YScg== X-Forwarded-Encrypted: i=1; AJvYcCX6i98KNOdOgVZbi4azm8w5SJeGsqro2kjkYOK0+N7xmgI6yecXJv59O6Wb02FgT6VAJkM9aQ4mbtGMmsM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywihc3pcAcPvNRqAMHR/Ber9GFnUpQIeCWMLrBoJRm2O9Wt6TS5 K1RAVLe8EOeSgVB1ZfbIC8JaoGlT5KgxKjqkBAzi+eAYvJIEgzWjxUp/oDDfqA== X-Gm-Gg: ASbGncsGLKsgMCFTtGPVwJZimsG6HCoP6ewhjkPdsqNbThwhRCYUfziFItB9HDQLqvJ EWAfB28MZfraRN8FbbbUZuwLYf2SKEwpJHCNVb9N5QH3Z1qnSYogy8OfhIp+4qwS7adkfvznJUV ghPMhH2nmQ/zgp3h6jctVk4ynoSN5qYO/Ua/Pmhbf+3Nfqi1VrnslL4+D7CAxgGYJzHvPqLIWVi Xtr8fyjitbhWhEMQDNWRF8ONsWkLbXUZsaVvakXOpOpVshNGeE4RUYWs0Y2VlisjKVTg6aphKNc iWrHgusQfT9YxHlZTHBT5O6epcWDSeUsU2Xw9zCyu9ng+jEbLXPPEvxvm23CUxRNpTd8X8C5ZkZ UUNA7bmGcUTol23aSRGoPHvtZIXZpKWGjfg== X-Google-Smtp-Source: AGHT+IF7PMb1R5q8p59rA8TPAQBNjDsN03YUpj4RFQLPJr+kj5p6VXfvnMhdUKLLBLycNLAOFsyk9g== X-Received: by 2002:a17:907:97c9:b0:ac2:cdcb:6a85 with SMTP id a640c23a62f3a-aca9b65e427mr329385266b.22.1744207355609; Wed, 09 Apr 2025 07:02:35 -0700 (PDT) Received: from akuchynski.c.googlers.com.com (185.155.90.34.bc.googleusercontent.com. [34.90.155.185]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be95d0sm102657966b.55.2025.04.09.07.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:02:35 -0700 (PDT) From: Andrei Kuchynski To: Heikki Krogerus , Greg Kroah-Hartman , Jameson Thies , Abhishek Pandit-Subedi , Benson Leung , Dmitry Baryshkov , Diogo Ivo , Pooja Katiyar , Madhu M Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Andrei Kuchynski , stable@vger.kernel.org Subject: [PATCH 1/2] usb: typec: ucsi: displayport: Fix deadlock Date: Wed, 9 Apr 2025 14:02:20 +0000 Message-ID: <20250409140221.654892-2-akuchynski@chromium.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250409140221.654892-1-akuchynski@chromium.org> References: <20250409140221.654892-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" This patch introduces the ucsi_con_mutex_lock / ucsi_con_mutex_unlock functions to the UCSI driver. ucsi_con_mutex_lock ensures the connector mutex is only locked if a connection is established and the partner pointer is valid. This resolves a deadlock scenario where ucsi_displayport_remove_partner holds con->mutex waiting for dp_altmode_work to complete while dp_altmode_work attempts to acquire it. Cc: stable@vger.kernel.org Fixes: af8622f6a585 ("usb: typec: ucsi: Support for DisplayPort alt mode") Signed-off-by: Andrei Kuchynski --- drivers/usb/typec/ucsi/displayport.c | 19 ++++++++------- drivers/usb/typec/ucsi/ucsi.c | 36 ++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 2 ++ 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/= displayport.c index 420af5139c70..acd053d4e38c 100644 --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -54,7 +54,8 @@ static int ucsi_displayport_enter(struct typec_altmode *a= lt, u32 *vdo) u8 cur =3D 0; int ret; =20 - mutex_lock(&dp->con->lock); + if (!ucsi_con_mutex_lock(dp->con)) + return -ENOTCONN; =20 if (!dp->override && dp->initialized) { const struct typec_altmode *p =3D typec_altmode_get_partner(alt); @@ -100,7 +101,7 @@ static int ucsi_displayport_enter(struct typec_altmode = *alt, u32 *vdo) schedule_work(&dp->work); ret =3D 0; err_unlock: - mutex_unlock(&dp->con->lock); + ucsi_con_mutex_unlock(dp->con); =20 return ret; } @@ -112,7 +113,8 @@ static int ucsi_displayport_exit(struct typec_altmode *= alt) u64 command; int ret =3D 0; =20 - mutex_lock(&dp->con->lock); + if (!ucsi_con_mutex_lock(dp->con)) + return -ENOTCONN; =20 if (!dp->override) { const struct typec_altmode *p =3D typec_altmode_get_partner(alt); @@ -144,7 +146,7 @@ static int ucsi_displayport_exit(struct typec_altmode *= alt) schedule_work(&dp->work); =20 out_unlock: - mutex_unlock(&dp->con->lock); + ucsi_con_mutex_unlock(dp->con); =20 return ret; } @@ -202,20 +204,21 @@ static int ucsi_displayport_vdm(struct typec_altmode = *alt, int cmd =3D PD_VDO_CMD(header); int svdm_version; =20 - mutex_lock(&dp->con->lock); + if (!ucsi_con_mutex_lock(dp->con)) + return -ENOTCONN; =20 if (!dp->override && dp->initialized) { const struct typec_altmode *p =3D typec_altmode_get_partner(alt); =20 dev_warn(&p->dev, "firmware doesn't support alternate mode overriding\n"); - mutex_unlock(&dp->con->lock); + ucsi_con_mutex_unlock(dp->con); return -EOPNOTSUPP; } =20 svdm_version =3D typec_altmode_get_svdm_version(alt); if (svdm_version < 0) { - mutex_unlock(&dp->con->lock); + ucsi_con_mutex_unlock(dp->con); return svdm_version; } =20 @@ -259,7 +262,7 @@ static int ucsi_displayport_vdm(struct typec_altmode *a= lt, break; } =20 - mutex_unlock(&dp->con->lock); + ucsi_con_mutex_unlock(dp->con); =20 return 0; } diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index e8c7e9dc4930..ef867136e51d 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -1922,6 +1922,42 @@ void ucsi_set_drvdata(struct ucsi *ucsi, void *data) } EXPORT_SYMBOL_GPL(ucsi_set_drvdata); =20 +/** + * ucsi_con_mutex_lock - Acquire the connector mutex + * @con: The connector interface to lock + * + * Returns true on success, false if the connector is disconnected + */ +bool ucsi_con_mutex_lock(struct ucsi_connector *con) +{ + bool mutex_locked =3D false; + bool connected =3D true; + + while (connected && !mutex_locked) { + mutex_locked =3D mutex_trylock(&con->lock) !=3D 0; + connected =3D UCSI_CONSTAT(con, CONNECTED); + if (connected && !mutex_locked) + msleep(20); + } + + connected =3D connected && con->partner; + if (!connected && mutex_locked) + mutex_unlock(&con->lock); + + return connected; +} +EXPORT_SYMBOL_GPL(ucsi_con_mutex_lock); + +/** + * ucsi_con_mutex_unlock - Release the connector mutex + * @con: The connector interface to unlock + */ +void ucsi_con_mutex_unlock(struct ucsi_connector *con) +{ + mutex_unlock(&con->lock); +} +EXPORT_SYMBOL_GPL(ucsi_con_mutex_unlock); + /** * ucsi_create - Allocate UCSI instance * @dev: Device interface to the PPM (Platform Policy Manager) diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 3a2c1762bec1..9c5278a0c5d4 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -94,6 +94,8 @@ int ucsi_register(struct ucsi *ucsi); void ucsi_unregister(struct ucsi *ucsi); void *ucsi_get_drvdata(struct ucsi *ucsi); void ucsi_set_drvdata(struct ucsi *ucsi, void *data); +bool ucsi_con_mutex_lock(struct ucsi_connector *con); +void ucsi_con_mutex_unlock(struct ucsi_connector *con); =20 void ucsi_connector_change(struct ucsi *ucsi, u8 num); =20 --=20 2.49.0.504.g3bcea36a83-goog From nobody Fri Dec 19 04:27:40 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 BE64D265CD8 for ; Wed, 9 Apr 2025 14:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744207363; cv=none; b=JeMwjJhz2HUBBm9r7LfnfemIzCsMleIkeAqRVy5Zzpp1kQDZb6xpUu3/wvBOF7p3ldNGysCTC5cuwYRiBdJAY5EmWX4o6MG8yEczdm4kC3RGrBOC7WCwDymE1I2uv38Y9D26U3cMW6mHoMS1sNVvMfciHB1VLa4Rq9uEW7El8TQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744207363; c=relaxed/simple; bh=mG96fuhZeMSiI4R/GosBkkESrvmzH8d+f53dlK48H50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xh4j3yyLGmec9RfLTriU3J/3J1AHpew/mUlRuQqdRmtSrVFDutjQhhlfTxCW1/y1Z3hcw5Cm/Dc2wP5QY3yb/MIygq7bLEhoQLocy4rVFultwAsFFq2SErkswYFxX/YapwRNT7YoPsE4S+FZpDHDSbXtKuvBlbnZIeQb49nAV5U= 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=c6/2GOgr; arc=none smtp.client-ip=209.85.218.53 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="c6/2GOgr" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ac25d2b2354so1230407466b.1 for ; Wed, 09 Apr 2025 07:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1744207360; x=1744812160; 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=KqfKoc5OtBfHsLnQESTgykRUnwgehQk6QiKSOB65pWU=; b=c6/2GOgrVvbSHtrK+LOIIbr0+LrQoYbcN751ah95zeEs2SdrJmgGHXWszmRH7Gkc8E qzW3EcCRkcAs0Bq2D+QGLK9MIMpqDJPLX079X9EkB8/CIiwJHqaNO2m+usSsi3rGCJkg OD6V1PDrycsWyNzHrcBRHV/WFhSxU6A1nYqVk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744207360; x=1744812160; 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=KqfKoc5OtBfHsLnQESTgykRUnwgehQk6QiKSOB65pWU=; b=p1i3tGXMSfDaYkqnk7LR3kUnVgykNHA0/MLsv1tp5rrb1vm+ERCOPRyzgEzISuBmf/ 8fIuEs8PYMafsYvmzKkplgCbnVD4vKI3m75qfSo8EVrYWxbbXilHgASb/fhE7WaCWdqW kz9KQTNGN9uueEWzQOwI8k0B05eKpdoGWkUJGbsxdpb2oQtcONri45ENvG/x1MJD8utq Rs9rIerUPN9I9gRLHUrBE81JZ/JzuPy20j40Hfegaj3+ObLlsACvAUl8SY29cLJw9UwO DaQVHvWwv/h6t2MljpRsKF49c9UBWrinwAvLwOYii7m/TpXkhF0ZdJqeaonZDKkg/dVK Jz8Q== X-Forwarded-Encrypted: i=1; AJvYcCXfkxyxHgZDxuSFmTu6bWVXz+YCmTYdTFEmvVT33PZNYDVoKTtzgfmwp40Y9TKOJUseSH0BblwmA7wBTwA=@vger.kernel.org X-Gm-Message-State: AOJu0YxQNZV74Dy/MnKS3Ii6JYgIsGta8GwDfiHJIuWNiEmntSei9b5t foAqTrwocIiO5dbwgubdHlSzxjn6SpCMdtPJXUM9EYAHkVUlyuA6XoM94SVYcQ== X-Gm-Gg: ASbGncv/eaaYJRc4kePNJgTv1mKfjAXjrSz8NuQ2+x5AaOVn0TLYfiTbFmL4xVWGPpe B6MbzF0O1y25ehj7H0VjpRETQ+xCnX77xSKQTBsdIw5OQ60jkiAqyGtVtSxFGLtmoPJDjsWMR0Z LnBgvezZpf0cLl0A8zefMqZ1AUMDFwSS5TiAm9vt4QJHtTWsEevhbyKHO0N9eOaUU+HmgIJ6fdc Yo72nK517uySeWn9dI4zfFSv6gKnF6hDcUMF0bR50JVfrHrA4uWJbEZobHPRgt1UebYvtcwz2I3 l/SbZRMycUV96Jxjnb6M2CV+ww4pdNOSKfNahbh3bXMBkdKTRe5RaQHFtDsVlUdSH2//CqSKxgb mW9D6rieIZtbzgIhl2ewYPJiQbe3oxFkdyw== X-Google-Smtp-Source: AGHT+IEWLkJa6H04bRvIjATOXf67M7GaZevp9XaqI0gC2rlSAY+sEhjXK4b4hzkWvOJzYrzvKZi5EQ== X-Received: by 2002:a17:907:9714:b0:ac2:84db:5916 with SMTP id a640c23a62f3a-aca9b6acee1mr356442466b.31.1744207358401; Wed, 09 Apr 2025 07:02:38 -0700 (PDT) Received: from akuchynski.c.googlers.com.com (185.155.90.34.bc.googleusercontent.com. [34.90.155.185]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be95d0sm102657966b.55.2025.04.09.07.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:02:38 -0700 (PDT) From: Andrei Kuchynski To: Heikki Krogerus , Greg Kroah-Hartman , Jameson Thies , Abhishek Pandit-Subedi , Benson Leung , Dmitry Baryshkov , Diogo Ivo , Pooja Katiyar , Madhu M Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Andrei Kuchynski , stable@vger.kernel.org Subject: [PATCH 2/2] usb: typec: ucsi: displayport: Fix NULL pointer access Date: Wed, 9 Apr 2025 14:02:21 +0000 Message-ID: <20250409140221.654892-3-akuchynski@chromium.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250409140221.654892-1-akuchynski@chromium.org> References: <20250409140221.654892-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" This patch ensures that the UCSI driver waits for all pending tasks in the ucsi_displayport_work workqueue to finish executing before proceeding with the partner removal. Cc: stable@vger.kernel.org Fixes: af8622f6a585 ("usb: typec: ucsi: Support for DisplayPort alt mode") Signed-off-by: Andrei Kuchynski Reviewed-by: Heikki Krogerus --- drivers/usb/typec/ucsi/displayport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/= displayport.c index acd053d4e38c..8aae80b457d7 100644 --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -299,6 +299,8 @@ void ucsi_displayport_remove_partner(struct typec_altmo= de *alt) if (!dp) return; =20 + cancel_work_sync(&dp->work); + dp->data.conf =3D 0; dp->data.status =3D 0; dp->initialized =3D false; --=20 2.49.0.504.g3bcea36a83-goog