| Message ID | 20170206213616.3661-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On 02/06/2017 01:36 PM, Christophe JAILLET wrote: > If 'dlpar_configure_connector()' fails, 'parent_dn' should be released as > already done in the normal case. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > arch/powerpc/platforms/pseries/mobility.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c > index 5a0c7ba429ce..b8060c182ae2 100644 > --- a/arch/powerpc/platforms/pseries/mobility.c > +++ b/arch/powerpc/platforms/pseries/mobility.c > @@ -226,13 +226,16 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) > return -ENOENT; > > dn = dlpar_configure_connector(drc_index, parent_dn); Simpler approach would be to move the of_node_put() call to here directly after the last use of parent_dn. -Tyrel > - if (!dn) > - return -ENOENT; > + if (!dn) { > + rc = -ENOENT; > + goto out; > + } > > rc = dlpar_attach_node(dn); > if (rc) > dlpar_free_cc_nodes(dn); > > +out: > of_node_put(parent_dn); > return rc; > } >
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index 5a0c7ba429ce..b8060c182ae2 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c @@ -226,13 +226,16 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) return -ENOENT; dn = dlpar_configure_connector(drc_index, parent_dn); - if (!dn) - return -ENOENT; + if (!dn) { + rc = -ENOENT; + goto out; + } rc = dlpar_attach_node(dn); if (rc) dlpar_free_cc_nodes(dn); +out: of_node_put(parent_dn); return rc; }
If 'dlpar_configure_connector()' fails, 'parent_dn' should be released as already done in the normal case. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- arch/powerpc/platforms/pseries/mobility.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)