提交 dfd20b2b 编写于 作者: B Brian Behlendorf 提交者: Linus Torvalds

drivers/block/brd.c: fix brd_lookup_page() race

The index on the page must be set before it is inserted in the radix
tree.  Otherwise there is a small race which can occur during lookup
where the page can be found with the incorrect index.  This will trigger
the BUG_ON() in brd_lookup_page().
Signed-off-by: NBrian Behlendorf <behlendorf1@llnl.gov>
Reported-by: NChris Wedgwood <cw@f00f.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@vger.kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e5ee7305
...@@ -117,13 +117,13 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector) ...@@ -117,13 +117,13 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector)
spin_lock(&brd->brd_lock); spin_lock(&brd->brd_lock);
idx = sector >> PAGE_SECTORS_SHIFT; idx = sector >> PAGE_SECTORS_SHIFT;
page->index = idx;
if (radix_tree_insert(&brd->brd_pages, idx, page)) { if (radix_tree_insert(&brd->brd_pages, idx, page)) {
__free_page(page); __free_page(page);
page = radix_tree_lookup(&brd->brd_pages, idx); page = radix_tree_lookup(&brd->brd_pages, idx);
BUG_ON(!page); BUG_ON(!page);
BUG_ON(page->index != idx); BUG_ON(page->index != idx);
} else }
page->index = idx;
spin_unlock(&brd->brd_lock); spin_unlock(&brd->brd_lock);
radix_tree_preload_end(); radix_tree_preload_end();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册