From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 24 Aug 2011 23:46:19 +0000 (+1000)
Subject: Don't dereference em if it's NULL or an error pointer.
X-Git-Tag: next-20110923~1^2~122
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c517353c6020be0c5cd9c59ba0197f6b0782b95a;p=karo-tx-linux.git

Don't dereference em if it's NULL or an error pointer.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b2d004ad66a0..f2a18f733d4d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1863,7 +1863,8 @@ static int btrfs_io_failed_hook(struct bio *failed_bio,
 
 		read_lock(&em_tree->lock);
 		em = lookup_extent_mapping(em_tree, start, failrec->len);
-		if (em->start > start || em->start + em->len < start) {
+		if (em && !IS_ERR(em) && (em->start > start ||
+					em->start + em->len < start)) {
 			free_extent_map(em);
 			em = NULL;
 		}