From: Dmitriy Monakhov sb_read may return NULL, so let's explicitly check it. Signed-off-by: Dmitriy Monakhov Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton --- fs/freevxfs/vxfs_bmap.c | 2 +- fs/freevxfs/vxfs_inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/freevxfs/vxfs_bmap.c~freevxfs-possible-null-pointer-dereference-fix fs/freevxfs/vxfs_bmap.c --- a/fs/freevxfs/vxfs_bmap.c~freevxfs-possible-null-pointer-dereference-fix +++ a/fs/freevxfs/vxfs_bmap.c @@ -137,7 +137,7 @@ vxfs_bmap_indir(struct inode *ip, long i 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 -puN fs/freevxfs/vxfs_inode.c~freevxfs-possible-null-pointer-dereference-fix fs/freevxfs/vxfs_inode.c --- a/fs/freevxfs/vxfs_inode.c~freevxfs-possible-null-pointer-dereference-fix +++ a/fs/freevxfs/vxfs_inode.c @@ -99,7 +99,7 @@ vxfs_blkiget(struct super_block *sbp, u_ 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; _