Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1238901 > unrolled thread

[PATCH v2 1/5] net: dsa: add missing kfree on remove

Started byNeil Armstrong <narmstrong@baylibre.com>
First post2015-10-03 16:30 +0200
Last post2015-10-06 13:20 +0200
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 1/5] net: dsa: add missing kfree on remove Neil Armstrong <narmstrong@baylibre.com> - 2015-10-03 16:30 +0200
    Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-10-03 16:40 +0200
      Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove Neil Armstrong <narmstrong@baylibre.com> - 2015-10-03 17:30 +0200
        Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-10-04 00:00 +0200
          Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove Neil Armstrong <narmstrong@baylibre.com> - 2015-10-06 09:30 +0200
            Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-10-06 13:20 +0200

#1238901 — [PATCH v2 1/5] net: dsa: add missing kfree on remove

FromNeil Armstrong <narmstrong@baylibre.com>
Date2015-10-03 16:30 +0200
Subject[PATCH v2 1/5] net: dsa: add missing kfree on remove
Message-ID<qfvZ0-4oI-27@gated-at.bofh.it>
To prevent memory leakage on unbinding, add missing kfree calls.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 net/dsa/dsa.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index c59fa5d..12cec40 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
 	for (i = 0; i < dst->pd->nr_chips; i++) {
 		struct dsa_switch *ds = dst->ds[i];

-		if (ds != NULL)
+		if (ds != NULL) {
 			dsa_switch_destroy(ds);
+			kfree(ds);
+		}
 	}
 }

@@ -924,6 +926,7 @@ static int dsa_remove(struct platform_device *pdev)
 	struct dsa_switch_tree *dst = platform_get_drvdata(pdev);

 	dsa_remove_dst(dst);
+	kfree(dst);
 	dsa_of_remove(&pdev->dev);

 	return 0;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1238902

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2015-10-03 16:40 +0200
Message-ID<qfw8F-4zM-5@gated-at.bofh.it>
In reply to#1238901
Hello.

On 10/3/2015 5:25 PM, Neil Armstrong wrote:

> To prevent memory leakage on unbinding, add missing kfree calls.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>   net/dsa/dsa.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
> index c59fa5d..12cec40 100644
> --- a/net/dsa/dsa.c
> +++ b/net/dsa/dsa.c
> @@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
>   	for (i = 0; i < dst->pd->nr_chips; i++) {
>   		struct dsa_switch *ds = dst->ds[i];
>
> -		if (ds != NULL)
> +		if (ds != NULL) {

    Didn;t scripts/checkpatch.pl complain here? just if (ds) is preferred in 
the networking code.

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238925

FromNeil Armstrong <narmstrong@baylibre.com>
Date2015-10-03 17:30 +0200
Message-ID<qfwV6-5K3-55@gated-at.bofh.it>
In reply to#1238902
On 10/03/2015 04:33 PM, Sergei Shtylyov wrote:
> Hello.
> 
> On 10/3/2015 5:25 PM, Neil Armstrong wrote:
> 
>> To prevent memory leakage on unbinding, add missing kfree calls.
>>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>>   net/dsa/dsa.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
>> index c59fa5d..12cec40 100644
>> --- a/net/dsa/dsa.c
>> +++ b/net/dsa/dsa.c
>> @@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
>>       for (i = 0; i < dst->pd->nr_chips; i++) {
>>           struct dsa_switch *ds = dst->ds[i];
>>
>> -        if (ds != NULL)
>> +        if (ds != NULL) {
> 
>    Didn;t scripts/checkpatch.pl complain here? just if (ds) is preferred in the networking code.
> 
> MBR, Sergei
> 
Yes,

But I considered the cosmetic changes are not the subject of this serie.

Neil
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1239008

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2015-10-04 00:00 +0200
Message-ID<qfD0t-60g-7@gated-at.bofh.it>
In reply to#1238925
On 10/3/2015 6:20 PM, Neil Armstrong wrote:

>> On 10/3/2015 5:25 PM, Neil Armstrong wrote:
>>
>>> To prevent memory leakage on unbinding, add missing kfree calls.
>>>
>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>>> ---
>>>    net/dsa/dsa.c | 5 ++++-
>>>    1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
>>> index c59fa5d..12cec40 100644
>>> --- a/net/dsa/dsa.c
>>> +++ b/net/dsa/dsa.c
>>> @@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
>>>        for (i = 0; i < dst->pd->nr_chips; i++) {
>>>            struct dsa_switch *ds = dst->ds[i];
>>>
>>> -        if (ds != NULL)
>>> +        if (ds != NULL) {
>>
>>     Didn;t scripts/checkpatch.pl complain here? just if (ds) is preferred in the networking code.
>>
>> MBR, Sergei
>>
> Yes,
>
> But I considered the cosmetic changes are not the subject of this serie.

    Formally, all the patches should be checkpatch-clean...

> Neil

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1240200

FromNeil Armstrong <narmstrong@baylibre.com>
Date2015-10-06 09:30 +0200
Message-ID<qguRc-7Jr-5@gated-at.bofh.it>
In reply to#1239008
On 10/03/2015 10:54 PM, Sergei Shtylyov wrote:
> On 10/3/2015 6:20 PM, Neil Armstrong wrote:
> 
>>> On 10/3/2015 5:25 PM, Neil Armstrong wrote:
>>>
>>>> To prevent memory leakage on unbinding, add missing kfree calls.
>>>>
>>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>>>> ---
>>>>    net/dsa/dsa.c | 5 ++++-
>>>>    1 file changed, 4 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
>>>> index c59fa5d..12cec40 100644
>>>> --- a/net/dsa/dsa.c
>>>> +++ b/net/dsa/dsa.c
>>>> @@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
>>>>        for (i = 0; i < dst->pd->nr_chips; i++) {
>>>>            struct dsa_switch *ds = dst->ds[i];
>>>>
>>>> -        if (ds != NULL)
>>>> +        if (ds != NULL) {
>>>
>>>     Didn;t scripts/checkpatch.pl complain here? just if (ds) is preferred in the networking code.
>>>
>>> MBR, Sergei
>>>
>> Yes,
>>
>> But I considered the cosmetic changes are not the subject of this serie.
> 
>    Formally, all the patches should be checkpatch-clean...
> 
>> Neil
> 
> MBR, Sergei
> 
Sure,

How should I handle this case ?
A separate patch with the cosmetic change before the kfree addition ?

Neil
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1240372

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2015-10-06 13:20 +0200
Message-ID<qgyrL-4xj-7@gated-at.bofh.it>
In reply to#1240200
Hello.

On 10/6/2015 10:25 AM, Neil Armstrong wrote:

>>>>> To prevent memory leakage on unbinding, add missing kfree calls.
>>>>>
>>>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>>>>> ---
>>>>>     net/dsa/dsa.c | 5 ++++-
>>>>>     1 file changed, 4 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
>>>>> index c59fa5d..12cec40 100644
>>>>> --- a/net/dsa/dsa.c
>>>>> +++ b/net/dsa/dsa.c
>>>>> @@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
>>>>>         for (i = 0; i < dst->pd->nr_chips; i++) {
>>>>>             struct dsa_switch *ds = dst->ds[i];
>>>>>
>>>>> -        if (ds != NULL)
>>>>> +        if (ds != NULL) {
>>>>
>>>>      Didn;t scripts/checkpatch.pl complain here? just if (ds) is preferred in the networking code.
>>>>
>>>> MBR, Sergei
>>>>
>>> Yes,
>>>
>>> But I considered the cosmetic changes are not the subject of this serie.
>>
>>     Formally, all the patches should be checkpatch-clean...
>>
>>> Neil
>>
>> MBR, Sergei
>>
> Sure,

> How should I handle this case ?
> A separate patch with the cosmetic change before the kfree addition ?

    No, that would classify as a cleanup, and cleanups shouldn't be queued 
before fixes (should be the other way around). Just do this in this same 
patch, possibly mentioning in the change log.

> Neil

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web