From: Bjorn Helgaas <helgaas@kernel.org>
To: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] pci: rpadlpar: fix leaked device_node references in add/remove paths
Date: Fri, 5 Apr 2019 18:04:43 -0500 [thread overview]
Message-ID: <20190405230443.GA200379@google.com> (raw)
In-Reply-To: <20190322182722.8255-1-tyreld@linux.vnet.ibm.com>
On Fri, Mar 22, 2019 at 01:27:21PM -0500, Tyrel Datwyler wrote:
> The find_dlpar_node() helper returns a device node with its reference
> incremented. Both the add and remove paths use this helper for find the
> appropriate node, but fail to release the reference when done.
>
> Annotate the find_dlpar_node() helper with a comment about the incremented
> reference count, and call of_node_put() on the obtained device_node in the
> add and remove paths. Also, fixup a reference leak in the find_vio_slot()
> helper where we fail to call of_node_put() on the vdevice node after we
> iterate over its children.
>
> Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Both applied to pci/hotplug for v5.2, thanks!
> ---
> drivers/pci/hotplug/rpadlpar_core.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
> index e2356a9c7088..182f9e3443ee 100644
> --- a/drivers/pci/hotplug/rpadlpar_core.c
> +++ b/drivers/pci/hotplug/rpadlpar_core.c
> @@ -51,6 +51,7 @@ static struct device_node *find_vio_slot_node(char *drc_name)
> if (rc == 0)
> break;
> }
> + of_node_put(parent);
>
> return dn;
> }
> @@ -71,6 +72,7 @@ static struct device_node *find_php_slot_pci_node(char *drc_name,
> return np;
> }
>
> +/* Returns a device_node with its reference count incremented */
> static struct device_node *find_dlpar_node(char *drc_name, int *node_type)
> {
> struct device_node *dn;
> @@ -306,6 +308,7 @@ int dlpar_add_slot(char *drc_name)
> rc = dlpar_add_phb(drc_name, dn);
> break;
> }
> + of_node_put(dn);
>
> printk(KERN_INFO "%s: slot %s added\n", DLPAR_MODULE_NAME, drc_name);
> exit:
> @@ -439,6 +442,7 @@ int dlpar_remove_slot(char *drc_name)
> rc = dlpar_remove_pci_slot(drc_name, dn);
> break;
> }
> + of_node_put(dn);
> vm_unmap_aliases();
>
> printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name);
> --
> 2.12.3
>
prev parent reply other threads:[~2019-04-05 23:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 18:27 [PATCH 1/2] pci: rpadlpar: fix leaked device_node references in add/remove paths Tyrel Datwyler
2019-03-22 18:27 ` [PATCH 2/2] pci: rpaphp: get/put device node reference during slot alloc/dealloc Tyrel Datwyler
2019-04-05 23:04 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405230443.GA200379@google.com \
--to=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=tyreld@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).