From nobody Sat Jul 25 05:29:25 2026 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 3B48B38D40D for ; Fri, 17 Jul 2026 09:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784281817; cv=none; b=RxQZ+eF3mpjZ66kJAC8pjK6jlGnq5e61dVCVBrCg1XHOuR9Q9SX1n/QAEG/WB6z5OFfp01G7vojNEK0EnMWHVafL1cWKXIoN4Ets6tImxAIQH8/yebS3fzIh3FfMtCseNDjgJGiBKrA1OAs+UWIOr17KTLYg0SXQs3MOvyrZg80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784281817; c=relaxed/simple; bh=bC7YpT9ESxLDoMaxGzhIMZGdoE+f+WJ4LDC/7lWaePg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WSs1hqOq7m2VPe8NxSdTX47Qox4zpZiokv/vF1vjFUJnEl3CJqSzjTCHv49uFRlNXqsYk5GFW3mMQBBzAJ7J2j4tur3SwY6tzgG6flMhS1KwvcH/NdV19OVWjDDqvn2KD2KFvPVTpXhmGtR4pfXTetDWQuw7lJvilEa/NE3gofU= 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=CIycSEun; arc=none smtp.client-ip=209.85.218.43 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="CIycSEun" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-c15cd3fd760so871188266b.2 for ; Fri, 17 Jul 2026 02:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784281812; x=1784886612; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=XD7Me5uj2XvXnDB/uQ2zJQ6z1KlcR/0Xv0ZRoQSvNBo=; b=CIycSEun7g2E/pqxQKSbpWYjWeRUoH3RuEfvH3hPpQCAFgfoOkHkGHycrz/GT4aiH+ ZzvEzFbx4lBOwg//HR2L+VAShq2adJ6LmCVggKt46Ie4Cr9HAJyW2jE8dBm5chGPwb7m 7bAdpMk4HC7qu34mbJYxgJ083zzcvkmWNB/G8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784281812; x=1784886612; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XD7Me5uj2XvXnDB/uQ2zJQ6z1KlcR/0Xv0ZRoQSvNBo=; b=HNBrKskoCxFEd4ofWvO34xfAuRJgb2l98/6LeR+C6M25tRwoSAvVRVcQ/QvE3+mzZZ Yik1jaMgQRNjAdL2jEFXztYAAz9y140jFZflrXokKsDrSTDZerPEkE1hmTc1AmDefJeP brczJylrMy7yEk6+JMEzgVpny5Bffz9NAdw6lB/w78NzEJPyS9mOc3cy7fEYeOdy9I4J ZB99jfSpQUs2Kj2l5RufFbxS3x6376mDvLVs3zVu+NrSx5sg5bAL/jMnQ63xhZ2msqDr A/7+XGgcP3SdfmSd1X5QMyZnGOyuPUQrj+Mlfc3EHW8OaIyCZRKM+eZGjlB/rExnp2m7 VYAQ== X-Forwarded-Encrypted: i=1; AHgh+RoMNq3stGhY1+cF+l7tXQ+Bb8hdKf0v3qa7wefZ6D/+AA7O445A/ICAo3dTggBoWQI8Tjxrgr+SNYoIIhU=@vger.kernel.org X-Gm-Message-State: AOJu0YwJpC5i5X3HwV3k7xm6ym2lH/QFHyZwBVnMyjOxpUcrlyJwHC8A S/Y1mYw8jhpRmcPYFKRbUbRtbR3nt8xSC7QbCpkUy2nrF5vzsuBKGYXzy/wdbV4Ypw== X-Gm-Gg: AfdE7cmEWk0ugb2OKgu+tg+/Zibhmacs1sVl6yt5qm6t3CMWtuStsZV9ENXg4846KjS 9zJq3X7HiU0KojptgklKCILfJQedpYJE5IYku8IFV80wC0GmIm99F4YAGoFIehBmcEt2tamKF5s hlCcq7E+1TncuajAEWI0hreNk8pgioI3af3FKFBmqr+TsWngTw/l0SboAiHThJFY8WESpu5Yv6j cNyubsrg6M/SDBLt1yAu/eXVhjexvcWNcz8kqRIlbkwzI/JVMmR6UxGm5PsMCPDrVfYV/ApXmIZ 0GVjUS0zjxxct/i8R4Bi7D9xaRpppW97b6VuPLGB07koHqXlW+Gk7iMD5gJjFndbdKXrcbdSI5x M0oAfGstA2QQMmZ8uKTe4NkbdB7YFAPnKSmVvfm3CfaNMBRos993W3KRYjNIun33RkmjtFrYg9C uuEUlW/1qFTUC0jiP5X+cve2HW8jySgZX/25qoPKO4vZ2nz9N1P5w0so0lqeHmneUWRA== X-Received: by 2002:a17:907:c1e:b0:c12:9e83:643 with SMTP id a640c23a62f3a-c16b46ab9a4mr73127266b.10.1784281812365; Fri, 17 Jul 2026 02:50:12 -0700 (PDT) Received: from akuchynski.c.googlers.com.com (91.27.34.34.bc.googleusercontent.com. [34.34.27.91]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c17009addd2sm48862466b.3.2026.07.17.02.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 02:50:11 -0700 (PDT) From: Andrei Kuchynski To: Heikki Krogerus , Jameson Thies , Benson Leung , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Pooja Katiyar , Abhishek Pandit-Subedi , Johan Hovold , Hsin-Te Yuan , Myrrh Periwinkle , Jack Pham , "Borah, Chaitanya Kumar" , Sergey Senozhatsky , Andrei Kuchynski , stable@vger.kernel.org Subject: [PATCH] usb: typec: ucsi: Correct teardown ordering in ucsi_init() error path Date: Fri, 17 Jul 2026 09:50:06 +0000 Message-ID: <20260717095006.101389-1-akuchynski@chromium.org> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog 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" 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") Link: https://lore.kernel.org/all/22064276-6c56-411a-9f20-6917ceeb865f@inte= l.com/ Signed-off-by: Andrei Kuchynski --- drivers/usb/typec/ucsi/ucsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 1ae4224d2dfc3..49f1c53721bbd 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -2142,11 +2142,11 @@ static int ucsi_init(struct ucsi *ucsi) return 0; =20 err_unregister: + for (con =3D connector; con->port; con++) + ucsi_unregister_port(con); for (i =3D 0; i < ucsi->cap.num_connectors; i++) lockdep_unregister_key(&connector[i].lock_key); =20 - for (con =3D connector; con->port; con++) - ucsi_unregister_port(con); kfree(connector); err_reset: memset(&ucsi->cap, 0, sizeof(ucsi->cap)); --=20 2.55.0.229.g6434b31f56-goog