| Message ID | 1508147672-58291-1-git-send-email-alan.1.wang@nokia-sbell.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | of: overlay: fix memory leak related to duplicated property | expand |
On Mon, Oct 16, 2017 at 4:54 AM, Lixin Wang <alan.1.wang@nokia-sbell.com> wrote: > From: alawang <alan.1.wang@nokia-sbell.com> > > Function of_changeset_add_property or of_changeset_update_property may > fails. In this case the property just allocated is never deallocated. > > Signed-off-by: Lixin Wang <alan.1.wang@nokia-sbell.com> > --- > drivers/of/overlay.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) Applied. Your author name and S-o-b name don't match. I fixed up the author name. Please fix your git config. Rob -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 8ecfee3..af3b9a1 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -162,6 +162,7 @@ static int of_overlay_apply_single_property(struct of_overlay *ov, bool is_symbols_node) { struct property *propn = NULL, *tprop; + int ret = 0; /* NOTE: Multiple changes of single properties not supported */ tprop = of_find_property(target, prop->name, NULL); @@ -186,10 +187,16 @@ static int of_overlay_apply_single_property(struct of_overlay *ov, /* not found? add */ if (tprop == NULL) - return of_changeset_add_property(&ov->cset, target, propn); - - /* found? update */ - return of_changeset_update_property(&ov->cset, target, propn); + ret = of_changeset_add_property(&ov->cset, target, propn); + else /* found? update */ + ret = of_changeset_update_property(&ov->cset, target, propn); + + if (ret) { + kfree(propn->name); + kfree(propn->value); + kfree(propn); + } + return ret; } static int of_overlay_apply_single_device_node(struct of_overlay *ov,