linux-kernel - [PATCH 3/3] mm/kmemleak.c: Merge the consecutive scan-areas.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 14 May 2013 19:49:51 +0800
From:	majianpeng <majianpeng@...il.com>
To:	Catalin Marinas <catalin.marinas@....com>
CC:	linux-mm <linux-mm@...ck.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH 3/3] mm/kmemleak.c: Merge the consecutive scan-areas.

If the scan-areas are adjacent,it can merge in order to reduce memomy.
And using pr_warn instead of pr_warning.

Signed-off-by: Jianpeng Ma <majianpeng@...il.com>
---
 mm/kmemleak.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index f0ece93..9590a57 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -746,24 +746,36 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp)
         return;
     }
 
-    area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
-    if (!area) {
-        pr_warning("Cannot allocate a scan area\n");
-        goto out;
-    }
-
     spin_lock_irqsave(&object->lock, flags);
     if (ptr + size > object->pointer + object->size) {
         kmemleak_warn("Scan area larger than object 0x%08lx\n", ptr);
         dump_object_info(object);
-        kmem_cache_free(scan_area_cache, area);
         goto out_unlock;
     }
+    hlist_for_each_entry(area, &object->area_list, node) {
+        if (ptr + size == area->start) {
+            area->start = ptr;
+            area->size += size;
+            goto out_unlock;
+        } else if (ptr == area->start + area->size) {
+            area->size += size;
+            goto out_unlock;
+        }
+
+    }
+    spin_unlock_irqrestore(&object->lock, flags);
+
+    area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
+    if (!area) {
+        pr_warn("Cannot allocate a scan area\n");
+        goto out;
+    }
 
     INIT_HLIST_NODE(&area->node);
     area->start = ptr;
     area->size = size;
 
+    spin_lock_irqsave(&object->lock, flags);
     hlist_add_head(&area->node, &object->area_list);
 out_unlock:
     spin_unlock_irqrestore(&object->lock, flags);
-- 
1.8.3.rc1.44.gb387c77


View attachment "0003-mm-kmemleak.c-Merge-the-consecutive-scan-areas.patch" of type "text/x-patch" (1837 bytes)