Unverified Commit b0cd67a0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14104 nilfs2: fix null-ptr-deref in block_dirty_buffer tracepoint 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yipeng Zou <zouyipeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3GUGXZJDMJUZX4EGZ4JXU2ABGF7FU4H7/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB956M 
 
Link:https://gitee.com/openeuler/kernel/pulls/14104

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents c8dbb3a6 797236af

fs/nilfs2/btnode.c

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
		goto failed;

	}

	memset(bh->b_data, 0, i_blocksize(inode));

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = blocknr;

	set_buffer_mapped(bh);

	set_buffer_uptodate(bh);
@@ -133,7 +132,6 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
		goto found;

	}

	set_buffer_mapped(bh);

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = pblocknr; /* set block address for read */

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);

fs/nilfs2/gcinode.c

+1 −3
Original line number Diff line number Diff line
@@ -83,10 +83,8 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, 
		goto out;

	}



	if (!buffer_mapped(bh)) {

		bh->b_bdev = inode->i_sb->s_bdev;

	if (!buffer_mapped(bh))

		set_buffer_mapped(bh);

	}

	bh->b_blocknr = pbn;

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);

fs/nilfs2/mdt.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block, 
	if (buffer_uptodate(bh))

		goto failed_bh;



	bh->b_bdev = sb->s_bdev;

	err = nilfs_mdt_insert_new_block(inode, block, bh, init_block);

	if (likely(!err)) {

		get_bh(bh);

fs/nilfs2/page.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, 
		put_page(page);

		return NULL;

	}

	bh->b_bdev = inode->i_sb->s_bdev;

	return bh;

}