Commit 044e2e26 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Avoid accessing uninitialized data on failed inode read 



When we fail to read inode, some data accessed in udf_evict_inode() may
be uninitialized. Move the accesses to !is_bad_inode() branch.

Reported-by: default avatar <syzbot+91f02b28f9bb5f5f1341@syzkaller.appspotmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 3d3dc274

fs/udf/inode.c

+14 −11
Original line number Diff line number Diff line
@@ -139,21 +139,24 @@ void udf_evict_inode(struct inode *inode) 
	struct udf_inode_info *iinfo = UDF_I(inode);

	int want_delete = 0;



	if (!inode->i_nlink && !is_bad_inode(inode)) {

	if (!is_bad_inode(inode)) {

		if (!inode->i_nlink) {

			want_delete = 1;

			udf_setsize(inode, 0);

			udf_update_inode(inode, IS_SYNC(inode));

		}

	truncate_inode_pages_final(&inode->i_data);

	invalidate_inode_buffers(inode);

	clear_inode(inode);

		if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB &&

		    inode->i_size != iinfo->i_lenExtents) {

		udf_warn(inode->i_sb, "Inode %lu (mode %o) has inode size %llu different from extent length %llu. Filesystem need not be standards compliant.\n",

			udf_warn(inode->i_sb,

				 "Inode %lu (mode %o) has inode size %llu different from extent length %llu. Filesystem need not be standards compliant.\n",

				 inode->i_ino, inode->i_mode,

				 (unsigned long long)inode->i_size,

				 (unsigned long long)iinfo->i_lenExtents);

		}

	}

	truncate_inode_pages_final(&inode->i_data);

	invalidate_inode_buffers(inode);

	clear_inode(inode);

	kfree(iinfo->i_ext.i_data);

	iinfo->i_ext.i_data = NULL;

	udf_clear_extent_cache(inode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE