* [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function
@ 2012-08-07 18:32 Jesper Juhl
2012-08-07 18:38 ` Jesper Juhl
2012-08-07 18:50 ` Antonio Quartulli
0 siblings, 2 replies; 4+ messages in thread
From: Jesper Juhl @ 2012-08-07 18:32 UTC (permalink / raw)
To: linux-kernel
Cc: netdev, b.a.t.m.a.n, David S. Miller, Antonio Quartulli,
Simon Wunderlich, Marek Lindner
Memory is allocated for 'tt_change_node' with kmalloc().
'tt_change_node' may go out of scope really being used for anything
(except have a few members initialized) if we hit the 'del:' label.
This patch makes sure we free the memory in that case.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
net/batman-adv/translation-table.c | 1 +
1 file changed, 1 insertion(+)
Compile tested only.
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index a438f4b..99dd8f7 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -197,6 +197,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv,
del:
list_del(&entry->list);
kfree(entry);
+ kfree(tt_change_node);
event_removed = true;
goto unlock;
}
--
1.7.11.4
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function
2012-08-07 18:32 [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function Jesper Juhl
@ 2012-08-07 18:38 ` Jesper Juhl
2012-08-07 18:50 ` Antonio Quartulli
1 sibling, 0 replies; 4+ messages in thread
From: Jesper Juhl @ 2012-08-07 18:38 UTC (permalink / raw)
To: linux-kernel
Cc: netdev, b.a.t.m.a.n, David S. Miller, Antonio Quartulli,
Simon Wunderlich, Marek Lindner
On Tue, 7 Aug 2012, Jesper Juhl wrote:
> Memory is allocated for 'tt_change_node' with kmalloc().
> 'tt_change_node' may go out of scope really being used for anything
This should of course read "... go out of scope without really being used ..." .
> (except have a few members initialized) if we hit the 'del:' label.
> This patch makes sure we free the memory in that case.
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> ---
> net/batman-adv/translation-table.c | 1 +
> 1 file changed, 1 insertion(+)
>
> Compile tested only.
>
> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
> index a438f4b..99dd8f7 100644
> --- a/net/batman-adv/translation-table.c
> +++ b/net/batman-adv/translation-table.c
> @@ -197,6 +197,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv,
> del:
> list_del(&entry->list);
> kfree(entry);
> + kfree(tt_change_node);
> event_removed = true;
> goto unlock;
> }
>
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function
2012-08-07 18:32 [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function Jesper Juhl
2012-08-07 18:38 ` Jesper Juhl
@ 2012-08-07 18:50 ` Antonio Quartulli
2012-08-08 23:04 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Antonio Quartulli @ 2012-08-07 18:50 UTC (permalink / raw)
To: Jesper Juhl
Cc: linux-kernel, netdev, b.a.t.m.a.n, David S. Miller,
Simon Wunderlich, Marek Lindner
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
On Tue, Aug 07, 2012 at 08:32:34PM +0200, Jesper Juhl wrote:
> Memory is allocated for 'tt_change_node' with kmalloc().
> 'tt_change_node' may go out of scope really being used for anything
> (except have a few members initialized) if we hit the 'del:' label.
> This patch makes sure we free the memory in that case.
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Antonio Quartulli <ordex@autistici.org>
Thank you very much Jepser!
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function
2012-08-07 18:50 ` Antonio Quartulli
@ 2012-08-08 23:04 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-08-08 23:04 UTC (permalink / raw)
To: ordex; +Cc: jj, linux-kernel, netdev, b.a.t.m.a.n, siwu, lindner_marek
From: Antonio Quartulli <ordex@autistici.org>
Date: Tue, 7 Aug 2012 20:50:36 +0200
> On Tue, Aug 07, 2012 at 08:32:34PM +0200, Jesper Juhl wrote:
>> Memory is allocated for 'tt_change_node' with kmalloc().
>> 'tt_change_node' may go out of scope really being used for anything
>> (except have a few members initialized) if we hit the 'del:' label.
>> This patch makes sure we free the memory in that case.
>>
>> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
>
> Acked-by: Antonio Quartulli <ordex@autistici.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-08 23:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-07 18:32 [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function Jesper Juhl
2012-08-07 18:38 ` Jesper Juhl
2012-08-07 18:50 ` Antonio Quartulli
2012-08-08 23:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox