From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 8D44B33D4EC for ; Thu, 2 Jul 2026 18:37:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783017464; cv=none; b=BhvsUb1ovZIwarX4Dp5oGnO8FdxGuU5fq/ga6uN03FTn4ANYFsFbre+q61SHGBtycMPTIzHnlkKzFeE/t8wag5D7O2MB6MY4dEEfJhjCuJKusR2YLPsvqooPaiDfcIrdToi+GDmStq6CR/K2KUv/JgMCrY2tJCmcmZgqtj7ojQU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783017464; c=relaxed/simple; bh=WlF+EcDXIqVMvrgbpCi5caEF7jFuZx8Z2utDNtPTcHQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OlnO0in3nXRu9EaqFSpFeQIqSftWUuEaBzL7wYsNP+nThOqNPSfMPOpvxUmvmHmAQbNhpdR+wSULaxuFYQMZvMPXqwTQirrNzkF8oEDyeqSAFGOKnTs3f0fMx5CMcG4ndIVhrRZoT1UsEz0U3AgSCIvwtFGP7nQ6qCj1TNSKZT4= 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=jWrEC2Vc; arc=none smtp.client-ip=192.198.163.16 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="jWrEC2Vc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1783017460; x=1814553460; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=WlF+EcDXIqVMvrgbpCi5caEF7jFuZx8Z2utDNtPTcHQ=; b=jWrEC2Vc+zw02pgC24xvhQf186sDWRkJlaRGvQhe5jpUAr3VRQy08xvt JaMJoCTapAXr1wS5w6UcIUB8E0R3zEHyVeb1ilx1uAXnnbXnFQUEOweT8 8vqKQk/DQLXB17nPbz2RSy079WgAa3RcZqigMtkijuIuKet5Zf55QEWfi +faPKfFl9umzunqvS6caW64SM+e8/us6UphfUVBCgkyBX0EvDWCZVp0vt czqsb2t+l+Bg9J7t5A3AoHt6CZR2W0wHYExsYiW0xvYFVyG86n/QJWMmE lXBE3XSKmjEAn5/9L2dJ66ESYIclElIZ2wkSIB/QCFuOlKVc8w9uFu91i Q==; X-CSE-ConnectionGUID: hRXUO0oTTe6vK66m/YM6jw== X-CSE-MsgGUID: /dULt9EoRNKTmlZwBP1mFg== X-IronPort-AV: E=McAfee;i="6800,10657,11835"; a="71299011" X-IronPort-AV: E=Sophos;i="6.25,144,1779174000"; d="scan'208";a="71299011" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2026 11:37:40 -0700 X-CSE-ConnectionGUID: 39dVX7EoTqSWP4QmvgcU/Q== X-CSE-MsgGUID: BsyYwALVQOeH/nlgPCfWOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,144,1779174000"; d="scan'208";a="251860180" Received: from ncintean-mobl1.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.244.196]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2026 11:37:39 -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] i3c: master: Fix device_register() error path Date: Thu, 2 Jul 2026 21:36:44 +0300 Message-ID: <20260702183644.60827-1-adrian.hunter@intel.com> X-Mailer: git-send-email 2.53.0 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 When device_register() fails in i3c_master_register_new_i3c_devs(), put_device() is called to drop the reference taken by device_register(). That drops the last reference, so the device's release callback i3c_device_release() runs and frees the i3c_device. Two problems follow from that: i3c_device_release() does WARN_ON(i3cdev->desc), so it warns because desc->dev->desc still points back at the descriptor. Clear it before calling put_device(). After put_device() frees the i3c_device, desc->dev is left pointing at freed memory, so clear desc->dev as well. That prevents, for example, i3c_master_unregister_i3c_devs() seeing desc->dev as non-NULL and dereferencing it. Reported-by: sashiko-bot@kernel.org Link: https://lore.kernel.org/linux-i3c/20260701203053.8F3971F000E9@smtp.kernel.org/ Fixes: cab63f6488761 ("i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs") Signed-off-by: Adrian Hunter --- drivers/i3c/master.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 979457e635bd..7254b13fe4f0 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1942,7 +1942,9 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master) if (ret) { dev_err(&master->dev, "Failed to add I3C device (err = %d)\n", ret); + desc->dev->desc = NULL; put_device(&desc->dev->dev); + desc->dev = NULL; } } } -- 2.53.0