* [PATCH v2 1/5] net: dsa: add missing kfree on remove
@ 2015-10-03 14:25 Neil Armstrong
2015-10-03 14:33 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2015-10-03 14:25 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli, Guenter Roeck, vivien.didelot,
Andrew Lunn, Fabian Frederick, Pavel Nakonechny, Joe Perches,
netdev, linux-kernel, nbd, sergei.shtylyov
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove
2015-10-03 14:25 [PATCH v2 1/5] net: dsa: add missing kfree on remove Neil Armstrong
@ 2015-10-03 14:33 ` Sergei Shtylyov
2015-10-03 15:20 ` Neil Armstrong
0 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2015-10-03 14:33 UTC (permalink / raw)
To: Neil Armstrong, David S. Miller, Florian Fainelli, Guenter Roeck,
vivien.didelot, Andrew Lunn, Fabian Frederick, Pavel Nakonechny,
Joe Perches, netdev, linux-kernel, nbd
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove
2015-10-03 14:33 ` Sergei Shtylyov
@ 2015-10-03 15:20 ` Neil Armstrong
2015-10-03 21:54 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2015-10-03 15:20 UTC (permalink / raw)
To: Sergei Shtylyov, David S. Miller, Florian Fainelli, Guenter Roeck,
vivien.didelot, Andrew Lunn, Fabian Frederick, Pavel Nakonechny,
Joe Perches, netdev, linux-kernel, nbd
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove
2015-10-03 15:20 ` Neil Armstrong
@ 2015-10-03 21:54 ` Sergei Shtylyov
2015-10-06 7:25 ` Neil Armstrong
0 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2015-10-03 21:54 UTC (permalink / raw)
To: Neil Armstrong, David S. Miller, Florian Fainelli, Guenter Roeck,
vivien.didelot, Andrew Lunn, Fabian Frederick, Pavel Nakonechny,
Joe Perches, netdev, linux-kernel, nbd
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove
2015-10-03 21:54 ` Sergei Shtylyov
@ 2015-10-06 7:25 ` Neil Armstrong
2015-10-06 11:15 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2015-10-06 7:25 UTC (permalink / raw)
To: Sergei Shtylyov, David S. Miller, Florian Fainelli, Guenter Roeck,
vivien.didelot, Andrew Lunn, Fabian Frederick, Pavel Nakonechny,
Joe Perches, netdev, linux-kernel, nbd
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/5] net: dsa: add missing kfree on remove
2015-10-06 7:25 ` Neil Armstrong
@ 2015-10-06 11:15 ` Sergei Shtylyov
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2015-10-06 11:15 UTC (permalink / raw)
To: Neil Armstrong, David S. Miller, Florian Fainelli, Guenter Roeck,
vivien.didelot, Andrew Lunn, Fabian Frederick, Pavel Nakonechny,
Joe Perches, netdev, linux-kernel, nbd
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-06 11:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-03 14:25 [PATCH v2 1/5] net: dsa: add missing kfree on remove Neil Armstrong
2015-10-03 14:33 ` Sergei Shtylyov
2015-10-03 15:20 ` Neil Armstrong
2015-10-03 21:54 ` Sergei Shtylyov
2015-10-06 7:25 ` Neil Armstrong
2015-10-06 11:15 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).