From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 CFAD0363C6B for ; Fri, 12 Jun 2026 08:01:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781251298; cv=none; b=CNtn+RyZ5kRIkYEC8+HMJXZZjuKWsNp6fJMRES+ma/EIPtxIMH+You/4Qt6Ww3E4RUOJUxp2gmNB5CwwtvKdrOhR4fjevChs4OIaoY+aU1FmSbIh5r7KzH6o1MhvDWD3dPQm8cnq5F+Zku2Yoncg9hUt9s2O+3mvT1PXDYw8pzM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781251298; c=relaxed/simple; bh=G2VBF5I/3bIyjAMmUNuVtyX/GsrjWjgY6P1OhlTSmq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gFjIeRysWg1uOZlX6DVnb2o/s5wB4gwU5vUk/oTK+N0R8PNvLjSsZePloI5ZOe9lVlKG3iRwjE2f7PGrFkMc/IG6bz7j3QYTO74taRJzD/XUiFlqdCPhDAIq8IeupbYuIueBKzS4N6h9ujvJxQGMhyRkw5D+f4gqYtM/Ynep4/w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=D0tmAv/m; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="D0tmAv/m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781251295; x=1812787295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G2VBF5I/3bIyjAMmUNuVtyX/GsrjWjgY6P1OhlTSmq4=; b=D0tmAv/m/ZtWxQcstp9AHPMOaJx2Aqykztq0Hte4EXDtRe3EfGxWLOSr 6/m6vzMomVtc79MfR2Ke5bOFVXefWJ5+JEy0mDcQXUqkoVm+wpvVC5lKk IxUHe50iyt2uiNQqp20D+HOEPBiEqH+cP0tJbPCi3EPAhGhE39TZ9vTJg oEB/kF43y1u9MmmMGPa8q0KIIA7q9zGGxTOI5qNGyR7pNnbXwkWhpqBgv sZkpUudLHYLM1DpqT6kZD16Rd7DuEgXb2ezbdN6uzaa070rNuG7FuUou/ MJRmL1q0uCCndTKzCgibgQZdHBGIw3Igm7Ph9L49uMvMX+F09yCC4VIjf A==; X-CSE-ConnectionGUID: gmbp5Kh+SquP1ZVuWoJKWw== X-CSE-MsgGUID: kedeCFVATgWAM7SyIMZr7w== X-IronPort-AV: E=McAfee;i="6800,10657,11813"; a="82186742" X-IronPort-AV: E=Sophos;i="6.24,200,1774335600"; d="scan'208";a="82186742" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2026 01:01:24 -0700 X-CSE-ConnectionGUID: S1XQ1QMXRdKtTu+WkU70Jg== X-CSE-MsgGUID: 72FjTA67QIS9rO+DBe+HDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,200,1774335600"; d="scan'208";a="246630355" Received: from vpanait-mobl.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.245.41]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2026 01:01:22 -0700 From: Adrian Hunter To: alexandre.belloni@bootlin.com Cc: Frank.Li@nxp.com, linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 3/7] i3c: master: Prevent reuse of dynamic address on device add failure Date: Fri, 12 Jun 2026 11:01:03 +0300 Message-ID: <20260612080107.11606-4-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260612080107.11606-1-adrian.hunter@intel.com> References: <20260612080107.11606-1-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit i3c_master_add_i3c_dev_locked() is called after a device has already been assigned a dynamic address. If the function fails, the address remains marked as free and may be reallocated to another device, leading to address conflicts on the bus. Ensure the address is not marked as free on failure, by updating the address slot state to prevent the address from being re-used. Emit an error message to inform of the failure. Opportunistically remove the !master check because it is impossible. Note, directly resetting the device's dynamic address is no longer an option, since Direct RSTDAA was deprecated from I3C starting from version 1.1 and v1.1 (or later) target devices are meant to NACK it. Fixes: 3a379bbcea0af ("i3c: Add core I3C infrastructure") Signed-off-by: Adrian Hunter Reviewed-by: Frank Li --- Changes in V4: Add Frank's Rev'd-by Changes in V3: Add note to commit message about Direct RSTDAA deprecation Changes in V2: Fix 'if (IS_ERR(newdev)' error path. Be defensive and do not change the addr_slot_status if it is not free, and update commit message accordingly. Amend commit message to note removal of unnecesary 'if (!master)' check. Add Fixes tag. drivers/i3c/master.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index f87bf0099d3c..7b60b0c7f646 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2345,12 +2345,11 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, bool enable_ibi = false; int ret; - if (!master) - return -EINVAL; - newdev = i3c_master_alloc_i3c_dev(master, &info); - if (IS_ERR(newdev)) - return PTR_ERR(newdev); + if (IS_ERR(newdev)) { + ret = PTR_ERR(newdev); + goto err_prevent_addr_reuse; + } ret = i3c_master_attach_i3c_dev(master, newdev); if (ret) @@ -2472,6 +2471,16 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, err_free_dev: i3c_master_free_i3c_dev(newdev); +err_prevent_addr_reuse: + /* + * Although the device has not been added, the address has been + * assigned. Prevent the address from being used again. + */ + if (i3c_bus_get_addr_slot_status(&master->bus, addr) == I3C_ADDR_SLOT_FREE) + i3c_bus_set_addr_slot_status(&master->bus, addr, I3C_ADDR_SLOT_I3C_DEV); + + dev_err(&master->dev, "Failed to add I3C device at address %u, error %d\n", addr, ret); + return ret; } EXPORT_SYMBOL_GPL(i3c_master_add_i3c_dev_locked); -- 2.51.0