aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-03-25 05:05:57 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-03 06:23:10 -0400
commit2121db74ba0fd2259f0e2265511684fadda9ac49 (patch)
tree823401f3bce7018535ceea69103a28accd5794f7 /mm
parentc826e3cd0c931d60d548f2468122da570d145556 (diff)
kmemtrace: trace kfree() calls with NULL or zero-length objects
Impact: also output kfree(NULL) entries This patch moves the trace_kfree() calls before the ZERO_OR_NULL_PTR check so that we can trace call-sites that call kfree() with NULL many times which might be an indication of a bug. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> LKML-Reference: <1237971957.30175.18.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c4
-rw-r--r--mm/slob.c4
-rw-r--r--mm/slub.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/mm/slab.c b/mm/slab.c
index fa00fd6a644d..b58400285030 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3773,6 +3773,8 @@ void kfree(const void *objp)
3773 struct kmem_cache *c; 3773 struct kmem_cache *c;
3774 unsigned long flags; 3774 unsigned long flags;
3775 3775
3776 trace_kfree(_RET_IP_, objp);
3777
3776 if (unlikely(ZERO_OR_NULL_PTR(objp))) 3778 if (unlikely(ZERO_OR_NULL_PTR(objp)))
3777 return; 3779 return;
3778 local_irq_save(flags); 3780 local_irq_save(flags);
@@ -3782,8 +3784,6 @@ void kfree(const void *objp)
3782 debug_check_no_obj_freed(objp, obj_size(c)); 3784 debug_check_no_obj_freed(objp, obj_size(c));
3783 __cache_free(c, (void *)objp); 3785 __cache_free(c, (void *)objp);
3784 local_irq_restore(flags); 3786 local_irq_restore(flags);
3785
3786 trace_kfree(_RET_IP_, objp);
3787} 3787}
3788EXPORT_SYMBOL(kfree); 3788EXPORT_SYMBOL(kfree);
3789 3789
diff --git a/mm/slob.c b/mm/slob.c
index 00003587ebfa..a2d4ab32198d 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -514,6 +514,8 @@ void kfree(const void *block)
514{ 514{
515 struct slob_page *sp; 515 struct slob_page *sp;
516 516
517 trace_kfree(_RET_IP_, block);
518
517 if (unlikely(ZERO_OR_NULL_PTR(block))) 519 if (unlikely(ZERO_OR_NULL_PTR(block)))
518 return; 520 return;
519 521
@@ -524,8 +526,6 @@ void kfree(const void *block)
524 slob_free(m, *m + align); 526 slob_free(m, *m + align);
525 } else 527 } else
526 put_page(&sp->page); 528 put_page(&sp->page);
527
528 trace_kfree(_RET_IP_, block);
529} 529}
530EXPORT_SYMBOL(kfree); 530EXPORT_SYMBOL(kfree);
531 531
diff --git a/mm/slub.c b/mm/slub.c
index a98078bf738b..7ab54ecbd3f3 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2792,6 +2792,8 @@ void kfree(const void *x)
2792 struct page *page; 2792 struct page *page;
2793 void *object = (void *)x; 2793 void *object = (void *)x;
2794 2794
2795 trace_kfree(_RET_IP_, x);
2796
2795 if (unlikely(ZERO_OR_NULL_PTR(x))) 2797 if (unlikely(ZERO_OR_NULL_PTR(x)))
2796 return; 2798 return;
2797 2799
@@ -2802,8 +2804,6 @@ void kfree(const void *x)
2802 return; 2804 return;
2803 } 2805 }
2804 slab_free(page->slab, page, object, _RET_IP_); 2806 slab_free(page->slab, page, object, _RET_IP_);
2805
2806 trace_kfree(_RET_IP_, x);
2807} 2807}
2808EXPORT_SYMBOL(kfree); 2808EXPORT_SYMBOL(kfree);
2809 2809