Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btree: fix tree corruption in btree_get_prev()

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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Roland Dreier and committed by
Linus Torvalds
cbf8ae32 7d8a4569

+2 -2
+2 -2
lib/btree.c
··· 319 319 320 320 if (head->height == 0) 321 321 return NULL; 322 - retry: 323 322 longcpy(key, __key, geo->keylen); 323 + retry: 324 324 dec_key(geo, key); 325 325 326 326 node = head->node; ··· 351 351 } 352 352 miss: 353 353 if (retry_key) { 354 - __key = retry_key; 354 + longcpy(key, retry_key, geo->keylen); 355 355 retry_key = NULL; 356 356 goto retry; 357 357 }