From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0F2EC36654F; Tue, 16 Dec 2025 12:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887198; cv=none; b=JGBDiMHJsoS+iPeSCnYh+MIqNq4NJUgEgSu2iy0Q0u6tGcqfDFbDb1hvWkrfXBHFlNleopNHoET6drjsvXBaGXHpbs+5LtgcNswkooT62TloHzMOmMdY6Lh/CZunAAQT1t2Vy1wjsgmVMW2QiCNI7sfs0Zyh32LUE0HSwkFeM14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887198; c=relaxed/simple; bh=gfB2eDQDuTIicMB/plVSz9aPsJUe/X5XpS+fm2K3g7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e9hYSWZS8SG8E2LiFJYixBj4Yr2r12KJEOk2qp8IgBeb/A+RLZg3eFMMKjxtDsbjnxY7hZKE6OqRECaYIxSTFGzl8Yips3js9R5iGRamvciCn66Qq1YoJJ1K2Btbn8B0r744uRfAGXh6XtyBZ6bYQDFsk/vBVleCfeSFfwr1auo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MTRvtja/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MTRvtja/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82471C4CEF1; Tue, 16 Dec 2025 12:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765887197; bh=gfB2eDQDuTIicMB/plVSz9aPsJUe/X5XpS+fm2K3g7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MTRvtja/eEqW480+gnZcrngCBP62rRv2Dv4SHB4r4f+sU+W9sByWiFPGpSyWHiUsG jV9Cqw4dJXPwGtqVGyiyTwfI0rBdfYLpvRbacxYSOcMVPRuggOabsc99a7ezA6Wh+j 0EvOrZXdlpfrFkSRsU4iOrvYyrznWW1ZT9IPZPD8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shuhao Fu , Frank Li , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.18 156/614] i3c: fix refcount inconsistency in i3c_master_register Date: Tue, 16 Dec 2025 12:08:43 +0100 Message-ID: <20251216111406.987060890@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Frank Li [ Upstream commit 9d4f219807d5ac11fb1d596e4ddb09336b040067 ] In `i3c_master_register`, a possible refcount inconsistency has been identified, causing possible resource leak. Function `of_node_get` increases the refcount of `parent->of_node`. If function `i3c_bus_init` fails, the function returns immediately without a corresponding decrease, resulting in an inconsistent refcounter. Move call i3c_bus_init() after device_initialize() to let callback i3c_masterdev_release() release of_node. Reported-by: Shuhao Fu Closes: https://lore.kernel.org/linux-i3c/aO2tjp_FsV_WohPG@osx.local/T/#m2c05a982beeb14e7bf039c1d8db856734bf234c7 Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure") Signed-off-by: Frank Li Link: https://patch.msgid.link/20251016143814.2551256-1-Frank.Li@nxp.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/i3c/master.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index d946db75df706..66513a27e6e77 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2883,10 +2883,6 @@ int i3c_master_register(struct i3c_master_controller *master, INIT_LIST_HEAD(&master->boardinfo.i2c); INIT_LIST_HEAD(&master->boardinfo.i3c); - ret = i3c_bus_init(i3cbus, master->dev.of_node); - if (ret) - return ret; - device_initialize(&master->dev); dev_set_name(&master->dev, "i3c-%d", i3cbus->id); @@ -2894,6 +2890,10 @@ int i3c_master_register(struct i3c_master_controller *master, master->dev.coherent_dma_mask = parent->coherent_dma_mask; master->dev.dma_parms = parent->dma_parms; + ret = i3c_bus_init(i3cbus, master->dev.of_node); + if (ret) + goto err_put_dev; + ret = of_populate_i3c_bus(master); if (ret) goto err_put_dev; -- 2.51.0