Unverified Commit 6306ff39 authored by Lizhi Xu's avatar Lizhi Xu Committed by Christian Brauner
Browse files

jfs: fix log->bdev_handle null ptr deref in lbmStartIO 



When sbi->flag is JFS_NOINTEGRITY in lmLogOpen(), log->bdev_handle can't
be inited, so it value will be NULL.
Therefore, add the "log ->no_integrity=1" judgment in lbmStartIO() to avoid such
problems.

Reported-and-tested-by: default avatar <syzbot+23bc20037854bb335d59@syzkaller.appspotmail.com>
Signed-off-by: default avatarLizhi Xu <lizhi.xu@windriver.com>
Link: https://lore.kernel.org/r/20231009094557.1398920-1-lizhi.xu@windriver.com


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent b3856da7

fs/jfs/jfs_logmgr.c

+5 −1
Original line number Diff line number Diff line
@@ -2110,10 +2110,14 @@ static void lbmStartIO(struct lbuf * bp) 
{

	struct bio *bio;

	struct jfs_log *log = bp->l_log;

	struct block_device *bdev = NULL;



	jfs_info("lbmStartIO");



	bio = bio_alloc(log->bdev_handle->bdev, 1, REQ_OP_WRITE | REQ_SYNC,

	if (!log->no_integrity)

		bdev = log->bdev_handle->bdev;



	bio = bio_alloc(bdev, 1, REQ_OP_WRITE | REQ_SYNC,

			GFP_NOFS);

	bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);

	__bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);