diff options
| author | Dmitriy Monakhov <dmonakhov@sw.ru> | 2007-05-08 00:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:14:59 -0700 |
| commit | 82f703bb8cb2732b4437a9f555a1be564e9e71c2 (patch) | |
| tree | 14b96636cc447ff00a5c3da0aa8d114f982b6cea /fs/freevxfs | |
| parent | 1368c4f2482c9e06bcb297217433818b171cc9e3 (diff) | |
| download | kernel-common-82f703bb8cb2732b4437a9f555a1be564e9e71c2.tar.gz kernel-common-82f703bb8cb2732b4437a9f555a1be564e9e71c2.tar.bz2 kernel-common-82f703bb8cb2732b4437a9f555a1be564e9e71c2.zip | |
freevxfs: possible null pointer dereference fix
sb_read may return NULL, so let's explicitly check it.
Signed-off-by: Dmitriy Monakhov <dmonakhov@openvz.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/freevxfs')
| -rw-r--r-- | fs/freevxfs/vxfs_bmap.c | 2 | ||||
| -rw-r--r-- | fs/freevxfs/vxfs_inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/freevxfs/vxfs_bmap.c b/fs/freevxfs/vxfs_bmap.c index 2d71128bd8d6..f86fd3cacd5a 100644 --- a/fs/freevxfs/vxfs_bmap.c +++ b/fs/freevxfs/vxfs_bmap.c @@ -137,7 +137,7 @@ vxfs_bmap_indir(struct inode *ip, long indir, int size, long block) bp = sb_bread(ip->i_sb, indir + (i / VXFS_TYPED_PER_BLOCK(ip->i_sb))); - if (!buffer_mapped(bp)) + if (!bp || !buffer_mapped(bp)) return 0; typ = ((struct vxfs_typed *)bp->b_data) + diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index 098a915fd9a1..d1f7c5b5b3c3 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c @@ -99,7 +99,7 @@ vxfs_blkiget(struct super_block *sbp, u_long extent, ino_t ino) offset = ((ino % (sbp->s_blocksize / VXFS_ISIZE)) * VXFS_ISIZE); bp = sb_bread(sbp, block); - if (buffer_mapped(bp)) { + if (bp && buffer_mapped(bp)) { struct vxfs_inode_info *vip; struct vxfs_dinode *dip; |