X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fkmemcheck.c;h=5bf191756a4a07b04ffe1dd792f475e1e0af0492;hb=870d4b12ad15d21c5db67b373bdc2f62cfe2ec64;hp=cab58bb592d8fa881dccfcddf0dcc7612f05128b;hpb=9576d3e622f325e617b272172dd68e329e742f77;p=karo-tx-linux.git

diff --git a/mm/kmemcheck.c b/mm/kmemcheck.c
index cab58bb592d8..5bf191756a4a 100644
--- a/mm/kmemcheck.c
+++ b/mm/kmemcheck.c
@@ -20,8 +20,7 @@ void kmemcheck_alloc_shadow(struct page *page, int order, gfp_t flags, int node)
 	shadow = alloc_pages_node(node, flags | __GFP_NOTRACK, order);
 	if (!shadow) {
 		if (printk_ratelimit())
-			printk(KERN_ERR "kmemcheck: failed to allocate "
-				"shadow bitmap\n");
+			pr_err("kmemcheck: failed to allocate shadow bitmap\n");
 		return;
 	}
 
@@ -60,6 +59,9 @@ void kmemcheck_free_shadow(struct page *page, int order)
 void kmemcheck_slab_alloc(struct kmem_cache *s, gfp_t gfpflags, void *object,
 			  size_t size)
 {
+	if (unlikely(!object)) /* Skip object if allocation failed */
+		return;
+
 	/*
 	 * Has already been memset(), which initializes the shadow for us
 	 * as well.