From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D203C2A1BA; Tue, 8 Jul 2025 16:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751992160; cv=none; b=L2DGCBmR/Vz+yYaf6HJ1GHsxSGVBUzJxp440l/A6gcBndKnU8isfWyTyXhG7bDDSvAmSgQIrWLjvGeE2z7VAn+EUOV8dEEJnMJ9d0BlZ2GeKeU+eaP1tIpJXFLSspy8YW1grraU931fkBhQILYNsWhckREECvlrpV7XND4L/mEc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751992160; c=relaxed/simple; bh=2ZomlejLWMsUqXw1IvDZY2OOkzBgCRollExaDAxwv0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PrahENhm1b0iEvEQiXe7ZkhnkzdGeFXD4M0qOpVXQK5G4oUL2oBCR/akYEyhhXKt/+rhCxznWm0Q0IS/9IlSnulGenSHmLi8xOYytD+U0785OwhIt5uW4FpPsp0Y6x8qHyLIy8LKcbs2+sEtLAA0cnXbJA2JpezN6H4qcG0DJaY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DResKVlJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DResKVlJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64DDCC4CEED; Tue, 8 Jul 2025 16:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751992160; bh=2ZomlejLWMsUqXw1IvDZY2OOkzBgCRollExaDAxwv0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DResKVlJloba/OLvvJgVL+JYakhCNEB3qnsTim/tXOn4B62XnEDAL5ieBVQlcXyI1 JNWbof5c5HK9HcDAInPeKWCLPcyQ6tAlNr501ApDjqlI+Q6+5x/a4JyYQo1Zso7oDJ m7NLmbmjgyG8XQRVPBMbbpWXPsNIUeWLKi0QIweo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Andrei Kuchynski , Heikki Krogerus Subject: [PATCH 6.1 77/81] usb: typec: displayport: Fix potential deadlock Date: Tue, 8 Jul 2025 18:24:09 +0200 Message-ID: <20250708162227.381987725@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250708162224.795155912@linuxfoundation.org> References: <20250708162224.795155912@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrei Kuchynski commit 099cf1fbb8afc3771f408109f62bdec66f85160e upstream. The deadlock can occur due to a recursive lock acquisition of `cros_typec_altmode_data::mutex`. The call chain is as follows: 1. cros_typec_altmode_work() acquires the mutex 2. typec_altmode_vdm() -> dp_altmode_vdm() -> 3. typec_altmode_exit() -> cros_typec_altmode_exit() 4. cros_typec_altmode_exit() attempts to acquire the mutex again To prevent this, defer the `typec_altmode_exit()` call by scheduling it rather than calling it directly from within the mutex-protected context. Cc: stable Fixes: b4b38ffb38c9 ("usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode") Signed-off-by: Andrei Kuchynski Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20250624133246.3936737-1-akuchynski@chromium.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/altmodes/displayport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -321,8 +321,7 @@ static int dp_altmode_vdm(struct typec_a case CMDT_RSP_NAK: switch (cmd) { case DP_CMD_STATUS_UPDATE: - if (typec_altmode_exit(alt)) - dev_err(&dp->alt->dev, "Exit Mode Failed!\n"); + dp->state = DP_STATE_EXIT; break; case DP_CMD_CONFIGURE: dp->data.conf = 0;