[PATCH 1/2] of: overlay: fix memory leak related to duplicated property

[PATCH 1/2] of: overlay: fix memory leak related to duplicated property

[alawang]

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: alawang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
---
 drivers/of/overlay.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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,
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] of: overlay: fix memory leak related to duplicated property

[Lixin Wang]

From: alawang <alan.1.wang@nokia-sbell.com>

Hello,

Sorry It was my fault in last email that wrote the wrong subject and sign off name.
Correct them this time.
Thanks

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(-)

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,
-- 
2.6.2

Re: [PATCH] of: overlay: fix memory leak related to duplicated property

[Rob Herring]

On Thu, Oct 12, 2017 at 10:07 PM, Lixin Wang
<alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org> wrote:
> From: alawang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
>
> Hello,
>
> Sorry It was my fault in last email that wrote the wrong subject and sign off name.
> Correct them this time.
> Thanks

This has to go below the '---' or it ends up in the commit message.
Please resend.

>
> 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-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
> ---
>  drivers/of/overlay.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
>
> 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,
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] of: overlay: fix memory leak related to duplicated property

[Frank Rowand]

On 10/12/17 18:53, alawang wrote:
> 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: alawang <alan.1.wang@nokia-sbell.com>
> ---
>  drivers/of/overlay.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> 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,
> 


I only received patch 1/2.  Can you please re-send patch 2/2?

Thanks,

Frank

Re: [PATCH] of: overlay: fix memory leak related to duplicated property

[Frank Rowand]

Hi Rob,

On 10/12/17 20:07, Lixin Wang wrote:
> From: alawang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
> 
> Hello,
> 
> Sorry It was my fault in last email that wrote the wrong subject and sign off name.
> Correct them this time.
> Thanks
> 
> 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-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
> ---
>  drivers/of/overlay.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> 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,
> 

Just a heads up.

This will conflict with my patch series "[PATCH 00/12] of: overlay: clean up
device tree overlay code" [1].  The issue that Lixin has identified will
still remain after applying my patch series, and can be fixed in the same
manner as his patch, just different context, including variable names.

[1] https://lkml.org/lkml/2017/10/2/679

-Frank
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/2] of: overlay: fix memory leak related to duplicated property

[Wang, Alan 1. (NSB - CN/Hangzhou)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2411 bytes --]

Hi Frank,

This only has one patch, and I was sent out this by mistake. Please skip this one and refer to my following subject "[PATCH] of: overlay: fix memory leak related to duplicated property"

https://lkml.org/lkml/2017/10/12/952

Thanks

-----Original Message-----
From: Frank Rowand [mailto:frowand.list@gmail.com] 
Sent: Saturday, October 14, 2017 5:39 AM
To: Wang, Alan 1. (NSB - CN/Hangzhou) <alan.1.wang@nokia-sbell.com>; Pantelis Antoniou <pantelis.antoniou@konsulko.com>; Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org
Subject: Re: [PATCH 1/2] of: overlay: fix memory leak related to duplicated property

On 10/12/17 18:53, alawang wrote:
> 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: alawang <alan.1.wang@nokia-sbell.com>
> ---
>  drivers/of/overlay.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> 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,
> 


I only received patch 1/2.  Can you please re-send patch 2/2?

Thanks,

Frank
N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·zøœzÚÞz)í…æèw*\x1fjg¬±¨\x1e¶‰šŽŠÝ¢j.ïÛ°\½½MŽúgjÌæa×\x02››–' ™©Þ¢¸\f¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾\a«‘êçzZ+ƒùšŽŠÝ¢j"ú!¶i

RE: [PATCH] of: overlay: fix memory leak related to duplicated property

[Wang, Alan 1. (NSB - CN/Hangzhou)]

Hi Frank,

Could I continue to send my patch since conflict with your patches? Or I have to wait for your patches merged? Thanks.

-----Original Message-----
From: Frank Rowand [mailto:frowand.list@gmail.com] 
Sent: Saturday, October 14, 2017 6:05 AM
To: Wang, Alan 1. (NSB - CN/Hangzhou) <alan.1.wang@nokia-sbell.com>; Pantelis Antoniou <pantelis.antoniou@konsulko.com>; Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org
Subject: Re: [PATCH] of: overlay: fix memory leak related to duplicated property

Hi Rob,

On 10/12/17 20:07, Lixin Wang wrote:
> From: alawang <alan.1.wang@nokia-sbell.com>
> 
> Hello,
> 
> Sorry It was my fault in last email that wrote the wrong subject and sign off name.
> Correct them this time.
> Thanks
> 
> 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(-)
> 
> 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,
> 

Just a heads up.

This will conflict with my patch series "[PATCH 00/12] of: overlay: clean up device tree overlay code" [1].  The issue that Lixin has identified will still remain after applying my patch series, and can be fixed in the same manner as his patch, just different context, including variable names.

[1] https://lkml.org/lkml/2017/10/2/679

-Frank

Re: [PATCH] of: overlay: fix memory leak related to duplicated property

[Frank Rowand]

Hi Alan,

It is Rob's choice of which order to take the patches in.

Either order, it will be a trivial fixup to the second patchset
to go in.

-Frank


On 10/15/17 19:35, Wang, Alan 1. (NSB - CN/Hangzhou) wrote:
> Hi Frank,
> 
> Could I continue to send my patch since conflict with your patches? Or I have to wait for your patches merged? Thanks.
> 
> -----Original Message-----
> From: Frank Rowand [mailto:frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org] 
> Sent: Saturday, October 14, 2017 6:05 AM
> To: Wang, Alan 1. (NSB - CN/Hangzhou) <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>; Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>; Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Subject: Re: [PATCH] of: overlay: fix memory leak related to duplicated property
> 
> Hi Rob,
> 
> On 10/12/17 20:07, Lixin Wang wrote:
>> From: alawang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
>>
>> Hello,
>>
>> Sorry It was my fault in last email that wrote the wrong subject and sign off name.
>> Correct them this time.
>> Thanks
>>
>> 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-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
>> ---
>>  drivers/of/overlay.c | 15 +++++++++++----
>>  1 file changed, 11 insertions(+), 4 deletions(-)
>>
>> 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,
>>
> 
> Just a heads up.
> 
> This will conflict with my patch series "[PATCH 00/12] of: overlay: clean up device tree overlay code" [1].  The issue that Lixin has identified will still remain after applying my patch series, and can be fixed in the same manner as his patch, just different context, including variable names.
> 
> [1] https://lkml.org/lkml/2017/10/2/679
> 
> -Frank
> 

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] of: overlay: fix memory leak related to duplicated property

[Lixin Wang]

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(-)

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,
-- 
2.6.2

Re: [PATCH] of: overlay: fix memory leak related to duplicated property

[Rob Herring]

On Mon, Oct 16, 2017 at 1:07 AM, Frank Rowand <frowand.list@gmail.com> wrote:
> Hi Alan,
>
> It is Rob's choice of which order to take the patches in.

If we have a choice, better to take fixes first so they can be more
easily backported.

Rob

> Either order, it will be a trivial fixup to the second patchset
> to go in.
>
> -Frank
>
>
> On 10/15/17 19:35, Wang, Alan 1. (NSB - CN/Hangzhou) wrote:
>> Hi Frank,
>>
>> Could I continue to send my patch since conflict with your patches? Or I have to wait for your patches merged? Thanks.
>>
>> -----Original Message-----
>> From: Frank Rowand [mailto:frowand.list@gmail.com]
>> Sent: Saturday, October 14, 2017 6:05 AM
>> To: Wang, Alan 1. (NSB - CN/Hangzhou) <alan.1.wang@nokia-sbell.com>; Pantelis Antoniou <pantelis.antoniou@konsulko.com>; Rob Herring <robh+dt@kernel.org>
>> Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org
>> Subject: Re: [PATCH] of: overlay: fix memory leak related to duplicated property
>>
>> Hi Rob,
>>
>> On 10/12/17 20:07, Lixin Wang wrote:
>>> From: alawang <alan.1.wang@nokia-sbell.com>
>>>
>>> Hello,
>>>
>>> Sorry It was my fault in last email that wrote the wrong subject and sign off name.
>>> Correct them this time.
>>> Thanks
>>>
>>> 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(-)
>>>
>>> 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,
>>>
>>
>> Just a heads up.
>>
>> This will conflict with my patch series "[PATCH 00/12] of: overlay: clean up device tree overlay code" [1].  The issue that Lixin has identified will still remain after applying my patch series, and can be fixed in the same manner as his patch, just different context, including variable names.
>>
>> [1] https://lkml.org/lkml/2017/10/2/679
>>
>> -Frank
>>
>

Re: [PATCH] of: overlay: fix memory leak related to duplicated property

[Rob Herring]

On Mon, Oct 16, 2017 at 4:54 AM, Lixin Wang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org> wrote:
> From: alawang <alan.1.wang-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
>
> 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-FTnzSCDXTkYjo0HpFSRKWA@public.gmane.org>
> ---
>  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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html