Browse files

btree: fix tree corruption in btree_get_prev()

commit cbf8ae3 upstream.

The memory the parameter __key points to is used as an iterator in
btree_get_prev(), so if we save off a bkey() pointer in retry_key and
then assign that to __key, we'll end up corrupting the btree internals
when we do eg

	longcpy(__key, bkey(geo, node, i), geo->keylen);

to return the key value.  What we should do instead is use longcpy() to
copy the key value that retry_key points to __key.

This can cause a btree to get corrupted by seemingly read-only
operations such as btree_for_each_safe.

[ avoid the double longcpy()]
Signed-off-by: Roland Dreier <>
Acked-by: Joern Engel <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Ben Hutchings <>
  • Loading branch information...
rolandd authored and bwhacks committed Jun 7, 2012
1 parent 74886d5 commit 043d295af99c056807d9647fe9fa8dd784a9ebb5
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/btree.c
@@ -319,8 +319,8 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo,
if (head->height == 0)
return NULL;
longcpy(key, __key, geo->keylen);
dec_key(geo, key);
node = head->node;
@@ -351,7 +351,7 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo,
if (retry_key) {
- __key = retry_key;
+ longcpy(key, retry_key, geo->keylen);
retry_key = NULL;
goto retry;

0 comments on commit 043d295

Please sign in to comment.