From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 452843438A7; Fri, 7 Aug 2026 14:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786114643; cv=none; b=O5EXwgYSj3bRqrfHZ03me+XKG0hqMuj7nT3W7gtyw0x2QNVw94c+Yjv5+FR4HfWlq8uaGPMU7OWLiG3+s1JbQZGMQzMy3Omlxm0snH4G1tsaVQLmJp5THSAfN/5JLsLCqiQAoKqjOEn5c1QjFuyShlFQG9l1oES+RhTM321iZ88= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786114643; c=relaxed/simple; bh=L+9mZVSiRsRnyst+0FxCYEaIlLLn1Bi6CqJAyvOppkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ITuku43aTzHA5cXOXYPW5snvRXCdogjX9mu+SG9XJ/ycCZxpbOTZU+kPCxw8uEyvksuSWdScfwv3DfiV1reBkNqXNT/KiT3snHj47rh96F+bcW4VgqyeNxZpU4gQlLS7bGnaFmQQg7GIe2Yhu1RGbYmcwjICMbFEa9dfMty6dmc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CnZijhxW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CnZijhxW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F16A1F00A3D; Fri, 7 Aug 2026 14:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786114642; bh=KkAnBhUXo8d6ewUkcX72rAv3w3HHh1jNZolpWQxJPcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CnZijhxWMgb3hgYBF76d5jsTILj1rhGJLyeiseCHeDRxHMgvhiFd49MrDXJrW65aN dbLUWXuu+/Fc8h3Zez7boQA6JTgqYP3fAbwZ5L6kSrreI02LgS9Q6DG35O27ED1d85 hKRSFa8+YAJ+u9UR7GnWJVmklL1UKiNN9+7i3erM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Borah, Chaitanya Kumar" , Andrei Kuchynski , Heikki Krogerus Subject: [PATCH 6.12 335/337] usb: typec: ucsi: Correct teardown ordering in ucsi_init() error path Date: Fri, 7 Aug 2026 16:38:58 +0200 Message-ID: <20260807143425.804043905@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143418.516897842@linuxfoundation.org> References: <20260807143418.516897842@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrei Kuchynski commit fb0bf289f5d529336ef490c8273e88a8a8b29f69 upstream. The commit 7aa7d4bf9d3f ("usb: typec: ucsi: Fix race condition and ordering in port unregistration") consolidated port teardown into the ucsi_unregister_port() helper. However, it introduced an ordering problem in the ucsi_init() error path. Fix this by ensuring ucsi_unregister_port() is called before we unregister their corresponding lockdep keys. Cc: stable@vger.kernel.org Fixes: 7aa7d4bf9d3f ("usb: typec: ucsi: Fix race condition and ordering in port unregistration") Reported-by: "Borah, Chaitanya Kumar" Closes: https://lore.kernel.org/all/22064276-6c56-411a-9f20-6917ceeb865f@intel.com/ Signed-off-by: Andrei Kuchynski Tested-by: Chaitanya Kumar Borah Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20260717104614.325250-1-akuchynski@chromium.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -1877,11 +1877,11 @@ static int ucsi_init(struct ucsi *ucsi) return 0; err_unregister: + for (con = connector; con->port; con++) + ucsi_unregister_port(con); for (i = 0; i < ucsi->cap.num_connectors; i++) lockdep_unregister_key(&connector[i].lock_key); - for (con = connector; con->port; con++) - ucsi_unregister_port(con); kfree(connector); err_reset: memset(&ucsi->cap, 0, sizeof(ucsi->cap));