浏览代码

vfs: check bh->b_blocknr only if BH_Mapped is set

Check bh->b_blocknr only if BH_Mapped is set.

akpm: I doubt if b_blocknr is ever uninitialised here, but it could
conceivably cause a problem if we're doing a lookup for block zero.

Signed-off-by: Nikanth Karthikesan <knikanth@suse.de>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Nikanth Karthikesan 16 年之前
父节点
当前提交
97f76d3d19
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      fs/buffer.c

+ 3 - 3
fs/buffer.c

@@ -199,13 +199,13 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
 	head = page_buffers(page);
 	head = page_buffers(page);
 	bh = head;
 	bh = head;
 	do {
 	do {
-		if (bh->b_blocknr == block) {
+		if (!buffer_mapped(bh))
+			all_mapped = 0;
+		else if (bh->b_blocknr == block) {
 			ret = bh;
 			ret = bh;
 			get_bh(bh);
 			get_bh(bh);
 			goto out_unlock;
 			goto out_unlock;
 		}
 		}
-		if (!buffer_mapped(bh))
-			all_mapped = 0;
 		bh = bh->b_this_page;
 		bh = bh->b_this_page;
 	} while (bh != head);
 	} while (bh != head);