From nobody Fri Dec 19 07:05:27 2025 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 9C8E313AC1 for ; Thu, 19 Dec 2024 01:35:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734572115; cv=none; b=YxQojpm3e4GZ9kG5vTSXWQ6WFceK/isGanMJWRlBocu9RS1BeWzvktPUonWu59Z6hPTwQyuWRxm9ZO8D44iBF0wzLFK65RUdEieo+K5o+vPe6Wf+H7qVO84KtX6GRR9mQZxe8Y5rLWu0ix0wx+QqVq+3Ll6sPaq+3FiTaxv/2/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734572115; c=relaxed/simple; bh=bxIRs1OVebSeiy9TTIMrzwDO5c9zCNsldIKJHACGYyU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=SMBOeJv9Xj1LyElp5TSAhn/rtz8xhwzgsIwSBWrasOLYFYLt0P6lN90fR9lVrdpYOrf9UF0Snp9vPZsgE9DLvH9eyKRgD03PwfRAJY196RNzVJTIcbOUPUllmYTjoMMxamP0UwSz0o+zx1NKQgdhxHdUSfFb29ESGUwGrFXHJ7w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=pf.is.s.u-tokyo.ac.jp; spf=none smtp.mailfrom=pf.is.s.u-tokyo.ac.jp; dkim=pass (2048-bit key) header.d=pf-is-s-u-tokyo-ac-jp.20230601.gappssmtp.com header.i=@pf-is-s-u-tokyo-ac-jp.20230601.gappssmtp.com header.b=iAqu6QWw; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=pf.is.s.u-tokyo.ac.jp Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=pf.is.s.u-tokyo.ac.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pf-is-s-u-tokyo-ac-jp.20230601.gappssmtp.com header.i=@pf-is-s-u-tokyo-ac-jp.20230601.gappssmtp.com header.b="iAqu6QWw" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-728ea1e0bdbso264324b3a.0 for ; Wed, 18 Dec 2024 17:35:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pf-is-s-u-tokyo-ac-jp.20230601.gappssmtp.com; s=20230601; t=1734572113; x=1735176913; 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; bh=LMxTrxWect/QiH701EJ9KjtGUUjihnCVjGI9HU4SHX0=; b=iAqu6QWw+c4QctHeZvSVemo8CGWgQiUYSFRWLaR2u56lOLpYMiU1tCg0jCGHOt6PRb JZETGeuuxFI2ejK7brcaS/e65EFcbjfoczV1d/jCqhYxjTOc9utKc3nvkDOXYpnOiirw ZieT5YwLkE68O58tbiEfpQP1jKOtMU/OcY6I9sOcokC87WN28BJs/jiZu9Lcmi0fh0Qg bjEY1R6rei9a/efg1gdx4d1vAl8KkEhWG+/Wm9quDEs7d6IDedmubMTkOzePAQj2W7PC QF7X9eIB7apVe8pLnEq7Y4MM43IslIYdfG5T9YV+h9LPLkH4NFGgLHAiZRueZM2oCrgw CHiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734572113; x=1735176913; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LMxTrxWect/QiH701EJ9KjtGUUjihnCVjGI9HU4SHX0=; b=svrrBjgMUJOy4WKrmyaX1YoZIbFC9e2T/yNhJqF0RVK1BeJf0N6qqbCY4fKzSXnldf g/Lz/ay2Udm+LF9Ifd/V31nyTdwbyoiTSVX2ADc6KJId7sYckbK+uwpi2MezEpgC9K3l P4ew2nchVUnKdqYO8L2fMezIqpHY7DfPxVyUwDiFyvZj9eHra/YxkEh49cZlLCQzpNaS vp1yv2L42XqGUmTQrg/7OqAilD9G6r0SHJmMuly/Q28rMzvDlSCiTp6PQyA0zBorXaq8 /Edh3UW4Yw7gz3i89PbaXkNYxlx/fxVtGJSoiwWSYrEnKoE9OfZ0NyigVIt1iPWrIuCc 5b0g== X-Gm-Message-State: AOJu0YyK48d3upgJ3At8w8RXNsHGrmkfnQcT/k0xgOrnb0l4ZYb8GBl8 O1CuLVjlY3AkpLFxr8BbpM9cJW/AO/0XCXxUwLrHc8Spn3Km9+aDj/5a/TwkKb0= X-Gm-Gg: ASbGncvQWDTh+odiGJeIOTsOUrDPmqaSj0I756/3zXNhdV5QzdDHVr8u+ZMOXQy/PxN Bq3Z00luY8Y8yEaMyW9ZUAa8p8z7kYlk3YD7eEbBc6QVrkYa6QV/f5kr8dmWA1xpDD/ymuNyNtV ywP6p5D7pfGs0DiNl08Gs/0/GR4o1HwtE7zevDMWfTLLzc7G+i8BEFmxdahdD6Zx3jm/xPPH833 nrU6ievVo1E+Lk4LPNF/fI3atDIy73tm0Iirpar0D3aUNv3WKukAA0Wej7wo/4Hc7e+Imil2inW 8GR211LWrB+7nd3OdjICjDSgTPespm6sbBDto0xJgXk= X-Google-Smtp-Source: AGHT+IFiU49X5kon9mTvkhQQVskhYRr4tmHuaBUAA3N923erf4Yr2ertxLKZBk1czPf6YX+WdpBaOA== X-Received: by 2002:a05:6a00:8087:b0:725:1de3:1c4a with SMTP id d2e1a72fcca58-72aa8c9d93fmr2673683b3a.3.1734572112821; Wed, 18 Dec 2024 17:35:12 -0800 (PST) Received: from localhost.localdomain (133-32-227-190.east.xps.vectant.ne.jp. [133.32.227.190]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad835469sm131579b3a.60.2024.12.18.17.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 17:35:12 -0800 (PST) From: Joe Hattori To: mchehab+huawei@kernel.org, sboyd@kernel.org Cc: linux-kernel@vger.kernel.org, krzk@kernel.org, Joe Hattori Subject: [PATCH v3] spmi: hisi-spmi-controller: manage the OF node reference in device initialization and cleanup Date: Thu, 19 Dec 2024 10:35:07 +0900 Message-Id: <20241219013507.1939266-1-joe@pf.is.s.u-tokyo.ac.jp> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" spmi_controller_probe() increments the refcount of an OF node, but does not release it. Instead, call of_node_get() in spmi_controller_alloc() and release it in spmi_ctrl_release() to avoid the reference leak. Also remove the lines in spmi_pmic_arb_bus_init() and spmi_controller_probe() where a pdev's of_node is stored after spmi_controller_alloc() is called, since the node is already set with an incremented refcount in spmi_controller_alloc(). Those lines do not overwrite the of_node since they set the same node that the spmi_controller_alloc() does, but are confusing at the very least. This bug was found by an experimental verification tool that I am developing. Fixes: e562cf3aea3e ("spmi: hisi-spmi-controller: move driver from staging") Signed-off-by: Joe Hattori --- Changes in v3: - Utilize device_set_node(). - Update the commit message. Changes in v2: - Remove the store to of_node in spmi_pmic_arb_bus_init(). --- drivers/spmi/hisi-spmi-controller.c | 1 - drivers/spmi/spmi-pmic-arb.c | 1 - drivers/spmi/spmi.c | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-c= ontroller.c index 3cafdf22c909..dd21c5d1ca83 100644 --- a/drivers/spmi/hisi-spmi-controller.c +++ b/drivers/spmi/hisi-spmi-controller.c @@ -301,7 +301,6 @@ static int spmi_controller_probe(struct platform_device= *pdev) spin_lock_init(&spmi_controller->lock); =20 ctrl->dev.parent =3D pdev->dev.parent; - ctrl->dev.of_node =3D of_node_get(pdev->dev.of_node); =20 /* Callbacks */ ctrl->read_cmd =3D spmi_read_cmd; diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 5c058db21821..73f2f19737f8 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -1746,7 +1746,6 @@ static int spmi_pmic_arb_bus_init(struct platform_dev= ice *pdev, irq_set_chained_handler_and_data(bus->irq, pmic_arb_chained_irq, bus); =20 - ctrl->dev.of_node =3D node; dev_set_name(&ctrl->dev, "spmi-%d", bus_index); =20 ret =3D devm_spmi_controller_add(dev, ctrl); diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index fb0101da1485..9964ecb36116 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -36,6 +36,7 @@ static void spmi_ctrl_release(struct device *dev) struct spmi_controller *ctrl =3D to_spmi_controller(dev); =20 ida_free(&ctrl_ida, ctrl->nr); + of_node_put(dev->of_node); kfree(ctrl); } =20 @@ -458,7 +459,7 @@ struct spmi_controller *spmi_controller_alloc(struct de= vice *parent, ctrl->dev.type =3D &spmi_ctrl_type; ctrl->dev.bus =3D &spmi_bus_type; ctrl->dev.parent =3D parent; - ctrl->dev.of_node =3D parent->of_node; + device_set_node(&ctrl->dev, of_fwnode_handle(of_node_get(parent->of_node)= )); spmi_controller_set_drvdata(ctrl, &ctrl[1]); =20 id =3D ida_alloc(&ctrl_ida, GFP_KERNEL); --=20 2.34.1