]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Don't dereference em if it's NULL or an error pointer.
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 26 Jul 2011 10:14:43 +0000 (20:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Aug 2011 05:14:19 +0000 (15:14 +1000)
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>
fs/btrfs/inode.c

index ae762dab37f827695ee42dbdfa047f3a96e73971..4c4c4af7ccbc9f0b903b354e8e64d5a6a567282a 100644 (file)
@@ -1865,7 +1865,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;
                }