]> git.hungrycats.org Git - linux/commitdiff
[PATCH] Fix NULL pointer dereference in blkmtd.c
authorAndrew Morton <akpm@osdl.org>
Fri, 12 Mar 2004 00:20:08 +0000 (16:20 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 12 Mar 2004 00:20:08 +0000 (16:20 -0800)
From: Michel Marti <michel.marti@objectxp.com>

The blkmtd driver oopses in add_device().  The following trivial patch
fixes this.

drivers/mtd/devices/blkmtd.c

index 2b2a63bed8939a97d855a73f97b5057d7d8a7de0..b4b4178943a10a7ffe8a11b35563264af6f7cdf6 100644 (file)
@@ -664,12 +664,12 @@ static struct blkmtd_dev *add_device(char *devname, int readonly, int erase_size
        }
 
        memset(dev, 0, sizeof(struct blkmtd_dev));
+       dev->blkdev = bdev;
        atomic_set(&(dev->blkdev->bd_inode->i_mapping->truncate_count), 0);
        if(!readonly) {
                init_MUTEX(&dev->wrbuf_mutex);
        }
 
-       dev->blkdev = bdev;
        dev->mtd_info.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
 
        /* Setup the MTD structure */