Skip to contentSkip to conversation

net/ipv4:Remove two memleak reports by kmemeleak_not_leak

PATCH In review majianpeng 2 participants 3 messages Apr 17, 2012

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

majianpeng

author
#0 lore raw

PATCH 1/1 net/ipv4:Remove two memleak reports by kmemeleak_not_leak

Quoted 1 line

From 582ed93b990e88110287ed0388bcb9057b1b8591 Mon Sep 17 00:00:00 2001

From: majianpeng <[email protected]>
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 <[email protected]>
---
 net/ipv4/route.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/route.c +6 -2
index 167ea10..1984c82 100644
@@ -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
Signature · 6 lines
1.7.5.4

 				
--------------
majianpeng
2012-04-17
#1 lore raw
Quoted 19 lines · majianpeng

From 582ed93b990e88110287ed0388bcb9057b1b8591 Mon Sep 17 00:00:00 2001
From: majianpeng <[email protected]>
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 <[email protected]>
---
 net/ipv4/route.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/route.c +0 -0
index 167ea10..1984c82 100644
@@ -3504,7 +3504,11 @@ int __init ip_rt_init(void)
  * this nonsense will go away.
  */
 void __init ip_static_sysctl_init(void)

net/ipv4/route.c int __init ip_rt_init(void) · line 3514

Quoted 10 lines
net/ipv4/route.c +6 -2
-{
-	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));
author
#2 lore raw

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

Thanks,I will correct it and resent the patch.

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

-------------------------------------------------------------
发件人：Eric Dumazet
发送日期：2012-04-17 13:18:54
收件人：majianpeng
抄送：netdev
主题：Re: [PATCH] net/ipv4:Remove two memleak reports bykmemeleak_not_leak

Quoted 19 lines · majianpeng

From 582ed93b990e88110287ed0388bcb9057b1b8591 Mon Sep 17 00:00:00 2001
From: majianpeng <[email protected]>
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 <[email protected]>
---
 net/ipv4/route.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/route.c +0 -0
index 167ea10..1984c82 100644
@@ -3504,7 +3504,11 @@ int __init ip_rt_init(void)
  * this nonsense will go away.
  */
 void __init ip_static_sysctl_init(void)

net/ipv4/route.c int __init ip_rt_init(void) · line 3514

Quoted 10 lines
net/ipv4/route.c +6 -2
-{
-	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));