lib/btree: fix possible NULL pointer dereference

mempool_alloc() can return null in atomic case. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Cc: Joern Engel <joern@logfs.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

lib/btree: fix possible NULL pointer dereference
mempool_alloc() can return null in atomic case. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Cc: Joern Engel <joern@logfs.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kirjanov@gmail.com · Linus Torvalds
1 parent bdef2fe88b
Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff
lib/btree.c
@@ -95,7 +95,8 @@
 	unsigned long *node;
  
 	node = mempool_alloc(head->mempool, gfp);
-	memset(node, 0, NODESIZE);
+	if (likely(node))
+		memset(node, 0, NODESIZE);
 	return node;
 }
...	...	@@ -95,7 +95,8 @@
95	95	unsigned long *node;
96	96
97	97	node = mempool_alloc(head->mempool, gfp);
98		- memset(node, 0, NODESIZE);
	98	+ if (likely(node))
	99	+ memset(node, 0, NODESIZE);
99	100	return node;
100	101	}
101	102