From: Neil Brown <neilb@suse.de>
Date: Mon, 10 Dec 2007 23:49:30 +0000 (-0800)
Subject: Fix NULL dereference in umem.c
X-Git-Tag: v2.6.24-rc5~7
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=794e64d5e9c7f088378e093a48eb36a30091d82d;p=linux-2.6-omap-h63xx.git

Fix NULL dereference in umem.c

Fix NULL dereference in umem.c

Signed-off-by: Neil Brown <neilb@suse.de>
Tested-by: Dave Chinner <dgc@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 99806f9ee4c..5f5095afb06 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -484,7 +484,8 @@ static void process_page(unsigned long data)
 		page->idx++;
 		if (page->idx >= bio->bi_vcnt) {
 			page->bio = bio->bi_next;
-			page->idx = page->bio->bi_idx;
+			if (page->bio)
+				page->idx = page->bio->bi_idx;
 		}
 
 		pci_unmap_page(card->dev, desc->data_dma_handle,