[PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak

[PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak

[majianpeng]

>From 582ed93b990e88110287ed0388bcb9057b1b8591 Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Tue, 17 Apr 2012 09:36:26 +0800
Subject: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.


Signed-off-by: majianpeng <majianpeng@gmail.com>
---
 net/ipv4/route.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 167ea10..1984c82 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3504,7 +3504,11 @@ int __init ip_rt_init(void)
  * this nonsense will go away.
  */
 void __init ip_static_sysctl_init(void)
-{
-	register_sysctl_paths(ipv4_path, ipv4_skeleton);
+{
+	struct ctl_table_header *ctl_header;
+
+	ctl_header = register_sysctl_paths(ipv4_path, ipv4_skeleton);
+	if (ctl_header)
+		kmemleak_not_leak(ctl_header);
 }
 #endif
-- 
1.7.5.4

 				
--------------
majianpeng
2012-04-17

Re: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak

[Eric Dumazet]

On Tue, 2012-04-17 at 09:41 +0800, majianpeng wrote:
> From 582ed93b990e88110287ed0388bcb9057b1b8591 Mon Sep 17 00:00:00 2001
> From: majianpeng <majianpeng@gmail.com>
> Date: Tue, 17 Apr 2012 09:36:26 +0800
> Subject: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.
> 
> 
> Signed-off-by: majianpeng <majianpeng@gmail.com>
> ---
>  net/ipv4/route.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index 167ea10..1984c82 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -3504,7 +3504,11 @@ int __init ip_rt_init(void)
>   * this nonsense will go away.
>   */
>  void __init ip_static_sysctl_init(void)
> -{
> -	register_sysctl_paths(ipv4_path, ipv4_skeleton);
> +{
> +	struct ctl_table_header *ctl_header;
> +
> +	ctl_header = register_sysctl_paths(ipv4_path, ipv4_skeleton);
> +	if (ctl_header)
> +		kmemleak_not_leak(ctl_header);
>  }
>  #endif

No need for this temp var and conditional.

Just :

	kmemleak_not_leak(register_sysctl_paths(ipv4_path, ipv4_skeleton));

[PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.

[majianpeng]

>From fe9ae7e12cc7bdc56705eb504facb71aa86dfe65 Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Tue, 17 Apr 2012 13:29:55 +0800
Subject: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.


Signed-off-by: majianpeng <majianpeng@gmail.com>
---
 net/ipv4/route.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 167ea10..dd15648 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3505,6 +3505,6 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
-	register_sysctl_paths(ipv4_path, ipv4_skeleton);
+	kmemleak_not_leak(register_sysctl_paths(ipv4_path, ipv4_skeleton));
 }
 #endif
-- 
1.7.5.4

 				
--------------
majianpeng
2012-04-17

Re: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.

[Eric Dumazet]

On Tue, 2012-04-17 at 13:33 +0800, majianpeng wrote:
> From fe9ae7e12cc7bdc56705eb504facb71aa86dfe65 Mon Sep 17 00:00:00 2001
> From: majianpeng <majianpeng@gmail.com>
> Date: Tue, 17 Apr 2012 13:29:55 +0800
> Subject: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.
> 
> 
> Signed-off-by: majianpeng <majianpeng@gmail.com>
> ---
>  net/ipv4/route.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index 167ea10..dd15648 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -3505,6 +3505,6 @@ int __init ip_rt_init(void)
>   */
>  void __init ip_static_sysctl_init(void)
>  {
> -	register_sysctl_paths(ipv4_path, ipv4_skeleton);
> +	kmemleak_not_leak(register_sysctl_paths(ipv4_path, ipv4_skeleton));
>  }
>  #endif

Acked-by: Eric Dumazet <eric.dumazet@gmail.com>

Thanks

Re: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.

[David Miller]

From: "majianpeng" <majianpeng@gmail.com>
Date: Tue, 17 Apr 2012 13:33:31 +0800

>>From fe9ae7e12cc7bdc56705eb504facb71aa86dfe65 Mon Sep 17 00:00:00 2001
> From: majianpeng <majianpeng@gmail.com>
> Date: Tue, 17 Apr 2012 13:29:55 +0800
> Subject: [PATCH] net/ipv4:Remove two memleak reports by kmemeleak_not_leak.
> 
> 
> Signed-off-by: majianpeng <majianpeng@gmail.com>

I've applied both of your patches, but you are EXTREMELY careless
with your commit log messages and subject lines.

In this patch, and the net/core one, you misspell "kmemleak_not_leak"

In the net/core patch, you failed to separate "by" and "kmemleak_not_leak"
with a space in the Subject line.

Furthermore, it is extraneous to include the same From:, Date:, and
Subject: fields in the body of your email.  They are just fine in
your normal email headers.

Thanks.