[PATCH 2/2] btree: Catch NULL value before it does harm

From: Roland Dreier
Date: Wed Jun 06 2012 - 13:17:28 EST


From: Joern Engel <joern@xxxxxxxxx>

Storing NULL values in the btree is illegal and can lead to memory
corruption and possible other fun as well. Catch it on insert, instead
of waiting for the inevitable.

Signed-off-by: Joern Engel <joern@xxxxxxxxx>
Signed-off-by: Roland Dreier <roland@xxxxxxxxxxxxxxx>
---
lib/btree.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/lib/btree.c b/lib/btree.c
index b6e889b..bd6d4b4 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -509,6 +509,7 @@ retry:
int btree_insert(struct btree_head *head, struct btree_geo *geo,
unsigned long *key, void *val, gfp_t gfp)
{
+ BUG_ON(!val);
return btree_insert_level(head, geo, key, val, 1, gfp);
}
EXPORT_SYMBOL_GPL(btree_insert);
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/