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 29582376A16 for ; Sun, 5 Jul 2026 13:48:04 +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=1783259285; cv=none; b=fe6688wbwXVoBmooLQf4bJb/7p7ZJC8u+podHReMDeo8n4wVEn+vQQLhMEfy8x1lTY12h5mTrykK5RLP+XJQuVhwDSgmCmYzVXL4oVOfMmdqbpEYQhJoAoVilHZm+pdcFUoqHCvErjVIEJ221SMtu8kTf/aOVbMoOugT8U/7VWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783259285; c=relaxed/simple; bh=gIEgPma3ZMd0K2FW74LRGe5X9KBlkX6Q91I8AryA/QI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hrB2hhIpzBnqURHzUwRI8viRnSyRJirVvjXPOFzSejBRaDn9NVD9g2RYTP4xOfuJMNUK9dtTrkbuODJ6kboSHo3Hy0p5VrXgRezOUHN0DQX4vER+YZXPe6mqBWucXgFQmpsik9MVYNNJ1fNhLnShFwe3YnhUkBfSfZFkryGfJIw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kOnTmbQU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kOnTmbQU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 925AB1F000E9; Sun, 5 Jul 2026 13:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783259284; bh=xSet+OZFwjko+7mzMjadfrF/3Xv9AHx0+mLLOMvBrtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kOnTmbQUe+wvQAX5xDFQC3AXn950Hzc1JvQbMwnV2yyabnK8//cm2uAX97ly7zNms gxU7gkdJgnD+EKjGqEIXlIWCdux5kLe51H9miWyejZbfZydUG+6gtQOc57roU31z8O OngHiyURETF/okxfOXw06vlDslP4QMgPU37zw4XBO9PJrDvRgJXk7u2KdwU4Xb03/P r912JErW4hEiJn05DPP0Q4+woKwopCcRv3mLyAOyOInHoBkUN8DKASevse4sKsocVQ 4s59Kr53wtnZEP0k6EhYVSWvX1SVhxivuw7rTpezC8iVMtNE+CN3+SgtFid9DOSmBL assJhdMZwXzWQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Wolfram Sang , Sasha Levin Subject: [PATCH 6.1.y 4/5] i2c: core: fix adapter debugfs creation Date: Sun, 5 Jul 2026 09:47:58 -0400 Message-ID: <20260705134759.1722831-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260705134759.1722831-1-sashal@kernel.org> References: <2026070232-jet-sheep-e8a6@gregkh> <20260705134759.1722831-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 07d5fb537928aad4369aaff0cbae73ba38a719af ] Clients can be registered from bus notifier callbacks so the debugfs directory needs to be created before registering the adapter as clients use that directory as their debugfs parent. Move debugfs creation before adapter registration to avoid having clients create their debugfs directories in the debugfs root (which is also more likely to fail due to name collisions). Note that failure to allocate the adapter name must now be handled explicitly as debugfs_create_dir() cannot handle a NULL name (unlike device_add() which returns an error). Fixes: 73febd775bdb ("i2c: create debugfs entry per adapter") Cc: stable@vger.kernel.org # 6.8 Cc: Wolfram Sang Signed-off-by: Johan Hovold Signed-off-by: Wolfram Sang Stable-dep-of: ba14d7cf2fe7 ("i2c: core: fix adapter registration race") Signed-off-by: Sasha Levin --- drivers/i2c/i2c-core-base.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 70876470348ab4..2c54799670182f 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1551,17 +1551,22 @@ static int i2c_register_adapter(struct i2c_adapter *adap) goto out_list; } - dev_set_name(&adap->dev, "i2c-%d", adap->nr); + res = dev_set_name(&adap->dev, "i2c-%d", adap->nr); + if (res) + goto err_remove_irq_domain; + adap->dev.bus = &i2c_bus_type; adap->dev.type = &i2c_adapter_type; - res = device_register(&adap->dev); + device_initialize(&adap->dev); + + adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root); + + res = device_add(&adap->dev); if (res) { pr_err("adapter '%s': can't register device (%d)\n", adap->name, res); - goto err_put_adap; + goto err_remove_debugfs; } - adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root); - res = i2c_setup_smbus_alert(adap); if (res) goto out_reg; @@ -1602,13 +1607,13 @@ static int i2c_register_adapter(struct i2c_adapter *adap) out_reg: i2c_deregister_clients(adap); - debugfs_remove_recursive(adap->debugfs); device_del(&adap->dev); -err_put_adap: +err_remove_debugfs: + debugfs_remove_recursive(adap->debugfs); init_completion(&adap->dev_released); put_device(&adap->dev); wait_for_completion(&adap->dev_released); - +err_remove_irq_domain: i2c_host_notify_irq_teardown(adap); out_list: mutex_lock(&core_lock); -- 2.53.0