From: Roland Dreier <roland@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Joern Engel <joern@logfs.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] btree: Fix tree corruption in btree_get_prev()
Date: Wed, 6 Jun 2012 10:17:26 -0700 [thread overview]
Message-ID: <1339003047-15734-1-git-send-email-roland@kernel.org> (raw)
From: Roland Dreier <roland@purestorage.com>
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.
Acked-by: Joern Engel <joern@logfs.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
lib/btree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/btree.c b/lib/btree.c
index e5ec1e9..b6e889b 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -351,7 +351,7 @@ retry:
}
miss:
if (retry_key) {
- __key = retry_key;
+ longcpy(__key, retry_key, geo->keylen);
retry_key = NULL;
goto retry;
}
--
1.7.9.5
next reply other threads:[~2012-06-06 17:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 17:17 Roland Dreier [this message]
2012-06-06 17:17 ` [PATCH 2/2] btree: Catch NULL value before it does harm Roland Dreier
2012-06-06 23:21 ` [PATCH 1/2] btree: Fix tree corruption in btree_get_prev() Andrew Morton
2012-06-06 23:36 ` Roland Dreier
2012-06-07 0:44 ` Roland Dreier
2012-06-07 1:29 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339003047-15734-1-git-send-email-roland@kernel.org \
--to=roland@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=joern@logfs.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox