From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 EEDDC3EC6A6 for ; Fri, 17 Jul 2026 10:46:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784285186; cv=none; b=IJeN7TuOugSYm3gcjb5dog/ImFBFKZkmUPDzchEcBxKp5Va0dSEq0MTToz8AVDPr9TjONJZbrRtZ7Os1SUCpjbdhh6UY0OG2MZHsi84YYa85HB7MnwCJK909KcOOWxVtuIIbVK3JwlyFkceo1KluS3sT1peCJpGHVJ6suWWs4jQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784285186; c=relaxed/simple; bh=Bu6ynCKZ0R7PBlqzGr8CS3vWxTyNWE9aRnYVfnWA7FM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tp9Rr/2d84rkFjXF5WSiXtj0MN5AMnpfe3JQw4FCroEc49FVejXUtkk0BzhUuiw1PhWGivtD3zysR4yYdifQz48WIuhOAUhCF3UeosFnRELn1AI2mFtJXoayXvDnTc418uGSD0YR7PF1r7gWzCsU4+dpkzPMa0SYZbcOIWC7Zp4= 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=AVJmc9Sx; arc=none smtp.client-ip=209.85.218.44 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="AVJmc9Sx" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-c1691e4ec40so237703266b.3 for ; Fri, 17 Jul 2026 03:46:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784285181; x=1784889981; 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=zNBp1FY7COTWRBaq8toEDefmotAUnsDCii/Qf5TL19I=; b=AVJmc9SxYlnKh/kv/wAcBkUlmyEunJ7mJPC6QR5EEC48KBAFFY6joZxqc17kSYj3Kb h8EfmjAMkPGHMqeGwB3w4D+Xy5Jmrx01JdYCk4Q/1+zAMgwn7PJCwi52YvjZi6Uirw5A Vmv9jhMinGf0QQDU+PQfO1cvVxFjsy/vBNwF0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784285181; x=1784889981; 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=zNBp1FY7COTWRBaq8toEDefmotAUnsDCii/Qf5TL19I=; b=GszVzAgEf3bBNi+nGMxIRPZIH+J616CPMMyR/2CFQ5j75JVcrYC7Rmqa0e9VWv8OwO FPCY6ySxcOkNx4bBfypTMNbPcP47NXUQpVRAKgAs3duSpDADgi43faMEpCHgta+X3Dzh QNOTZwx7IyAeveAOaU6C3P6xaLHnl/oRTHl3B3LgXUdcKvJCnVTPUlRRWqKU/rDqA7HX 51Fnhx1vWnthBZH9Oly+msS6MCYBmTRVAwhQNPvW5r3aGO3oYJmAZthUl7ajAQ2iKvsU OYuvlfQfl/x/AxpVzAcCUkaIYypFt6i1JFIwDhkgRqIifHM1G0weKofACNjgpchlt1dl 4s+w== X-Forwarded-Encrypted: i=1; AHgh+RpuiB6+OaH1Eof14ee4oSlBzjkBmXp8T2+P+fPVjPGeZxTEG0jnnoNf5cyTlqv8m3O0FunsYY23+mmI/tA=@vger.kernel.org X-Gm-Message-State: AOJu0YycMDCy+qHxCdPmBneXL8p08wYKMObxP6zJ5r1y0MyRGM7jpoJv KYqbaHXRRb2Oy6gcQV9N4bH5zVBTF9bGIu2DWBqSgXsdjqLMi0zClYCOcSnxpFEKdg== X-Gm-Gg: AfdE7clZ+/Aisu4Hu7BGjjpD8Oqh3cfBTiwYvU45nA3IyN7ULgrLWuw7C0xojKINfQE bz9S7Gk3eAJ534FGEmSHmKn3e5rQd4HA/SmENoJdz8eUkDk/Ofiw8+m0z+tWIWuTQNx8QQ+8Trh n/tWZbMs12sc+9osUGTfe255+8vu172kjlwVEmBkeWZsAQ9D7b0FNf5i/4jy+AdS+A70b5/7RH5 8guISYLi8UMjve4VauAC9mCnRYbHR0BYwpkc8OQ59oCdadIHUrecpKNg6hFhAEE/cDbKXDrDWAb U03IwQYbmzklpUasMAMk+InM5oZGaXyFu2aiRJhS8WVvpWDm0LJQNunthEycZBTzow0Vf3OY7qE lANr/EMfYc7yGjAh55wg8m35i+CrkK/ciXA3jtwUid8c3hUT0PjjoD8QVqlJGvBsnKzJkdGNKJ0 n40lCMqKOx2p/3sxNhUHtjXgkGlq5B1VTkYDxth4FkiDUr2mr+zGHRnHq8LnAxKmOkuA== X-Received: by 2002:a17:906:9fca:b0:c15:ce72:9350 with SMTP id a640c23a62f3a-c16b47d8363mr98457266b.41.1784285181113; Fri, 17 Jul 2026 03:46:21 -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-c1724f50bddsm56652966b.47.2026.07.17.03.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 03:46:20 -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 v2] usb: typec: ucsi: Correct teardown ordering in ucsi_init() error path Date: Fri, 17 Jul 2026 10:46:14 +0000 Message-ID: <20260717104614.325250-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: 8bit 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 --- Changes in v2: - Added Reported-by tag. 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; 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)); -- 2.55.0.229.g6434b31f56-goog