From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C126D20D519 for ; Wed, 19 Mar 2025 11:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382728; cv=none; b=WrAmxoozxnhGdEDHoxS2oGC+gK6PQCyKfDC+BtvFBp/EsjjhlNKFeZo4h1iIVYIEjUikZgLzph4gmtI3tRjZdsxGvwDKmDmasQG3QilJqxpkeFYUTw0tyQBuE3q7q0BmPPHUl5x3OD4UGa/Wuw2sPqIlif3RrwjFezOhPww7AxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382728; c=relaxed/simple; bh=Nn8GW/g+URJmE2DM2MdV6gUuYJPV+5JzbWVhYfToAUQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=bDm3dX6ttw3PMQTQPtUbhXaS3fAtKDfjQZgmNnfd/XRYY6FLT2EoIZnAEP/rnNeNILLf4eLq5jDt/Yj5y5vnWqr1t+hHM00iWBpUm5ND8OtWLX7aqsL4hSlRzThSOUdLgGo4khvx+ndrE5PpDg5MlJYoo1IUcwvc26hSQf2Kqvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 586BD113E; Wed, 19 Mar 2025 04:12:14 -0700 (PDT) Received: from J2N7QTR9R3 (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B605E3F63F; Wed, 19 Mar 2025 04:12:04 -0700 (PDT) Date: Wed, 19 Mar 2025 11:12:02 +0000 From: Mark Rutland To: Sudeep Holla Cc: Miaoqian Lin , Gavin Shan , Lorenzo Pieralisi , Will Deacon , Hanjun Guo , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] firmware: psci: Fix refcount leak in psci_dt_init Message-ID: References: <20250318151712.28763-1-linmq006@gmail.com> <28cb8360-7fb0-46f0-b05f-5114f1974cf3@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Mar 19, 2025 at 10:46:49AM +0000, Sudeep Holla wrote: > On Wed, Mar 19, 2025 at 08:28:38PM +1000, Gavin Shan wrote: > Any reason why we can't move to the new scoped usage like below? > diff --git i/drivers/firmware/psci/psci.c w/drivers/firmware/psci/psci.c > index a1ebbe9b73b1..a4269078b2a2 100644 > --- i/drivers/firmware/psci/psci.c > +++ w/drivers/firmware/psci/psci.c > @@ -797,12 +797,11 @@ static const struct of_device_id psci_of_match[] __initconst = { > > int __init psci_dt_init(void) > { > - struct device_node *np; > const struct of_device_id *matched_np; > psci_initcall_t init_fn; > int ret; > - > - np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np); > + struct device_node *np __free(device_node) = > + of_find_matching_node_and_match(NULL, psci_of_match, &matched_np); > > if (!np || !of_device_is_available(np)) > return -ENODEV; > @@ -810,7 +809,6 @@ int __init psci_dt_init(void) > init_fn = (psci_initcall_t)matched_np->data; > ret = init_fn(np); > > - of_node_put(np); > return ret; > } IIUC the bug has existed since before the scoped helpers were introduced, so for the sake of keeping the backport simple I reckon we should take Miaoqian Lin's patch as-is, and we can consider moving to the scoped helpers as a later cleanup. Mark.