summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-06-07 14:21:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-17 11:21:22 -0700
commit5a32293d5c1045e99b70582783b453d08e71cfdb (patch)
treec281fc570e26e958eb6e41e86192a27f386d0162 /lib
parent6d6a10124daeccc44f5d291cad4bea64639a2c66 (diff)
downloadlinux-3.10-5a32293d5c1045e99b70582783b453d08e71cfdb.tar.gz
linux-3.10-5a32293d5c1045e99b70582783b453d08e71cfdb.tar.bz2
linux-3.10-5a32293d5c1045e99b70582783b453d08e71cfdb.zip
btree: fix tree corruption in btree_get_prev()
commit cbf8ae32f66a9ceb8907ad9e16663c2a29e48990 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. [akpm@linux-foundation.org: avoid the double longcpy()] Signed-off-by: Roland Dreier <roland@purestorage.com> Acked-by: Joern Engel <joern@logfs.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/btree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c
index e5ec1e9c1aa..5cf9e74ec3f 100644
--- a/lib/btree.c
+++ b/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;
-retry:
longcpy(key, __key, geo->keylen);
+retry:
dec_key(geo, key);
node = head->node;
@@ -351,7 +351,7 @@ retry:
}
miss:
if (retry_key) {
- __key = retry_key;
+ longcpy(key, retry_key, geo->keylen);
retry_key = NULL;
goto retry;
}