diff options
author | Tyrel Datwyler <tyreld@linux.vnet.ibm.com> | 2017-09-20 17:02:52 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-09-21 05:33:16 -0400 |
commit | b537ca6fede69a281dc524983e5e633d79a10a08 (patch) | |
tree | 1d66389a711e6f4cbf97e022f9cc555c8a8bf7de | |
parent | 087ff6a5ae3052bb2835e191094b793789cb8817 (diff) |
powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
A reference to the parent device node is held by add_dt_node() for the
node to be added. If the call to dlpar_configure_connector() fails
add_dt_node() returns ENOENT and that reference is not freed.
Add a call to of_node_put(parent_dn) prior to bailing out after a
failed dlpar_configure_connector() call.
Fixes: 8d5ff320766f ("powerpc/pseries: Make dlpar_configure_connector parent node aware")
Cc: stable@vger.kernel.org # v3.12+
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/platforms/pseries/mobility.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index 210ce632d63e..f7042ad492ba 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c | |||
@@ -226,8 +226,10 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) | |||
226 | return -ENOENT; | 226 | return -ENOENT; |
227 | 227 | ||
228 | dn = dlpar_configure_connector(drc_index, parent_dn); | 228 | dn = dlpar_configure_connector(drc_index, parent_dn); |
229 | if (!dn) | 229 | if (!dn) { |
230 | of_node_put(parent_dn); | ||
230 | return -ENOENT; | 231 | return -ENOENT; |
232 | } | ||
231 | 233 | ||
232 | rc = dlpar_attach_node(dn, parent_dn); | 234 | rc = dlpar_attach_node(dn, parent_dn); |
233 | if (rc) | 235 | if (rc) |