Commit 4f1b1519 authored Jan 01, 2016 by Arnd Bergmann Committed by Jan Kara Jan 04, 2016

udf: avoid uninitialized variable use

A new warning has come up from a recent cleanup:

fs/udf/inode.c: In function 'udf_setup_indirect_aext':
fs/udf/inode.c:1927:28: warning: 'adsize' may be used uninitialized in this function [-Wmaybe-uninitialized]

If the alloc_type is neither ICBTAG_FLAG_AD_SHORT nor
ICBTAG_FLAG_AD_LONG, the value of adsize is undefined. Currently,
callers of these functions make sure alloc_type is one of the two valid
ones but for future proofing make sure we handle the case of invalid
alloc type as well. This changes the code to return -EIOin that case.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: fcea62ba ("udf: Factor out code for creating indirect extent")
Signed-off-by: Jan Kara <jack@suse.cz>

parent 6c371578

fs/udf/inode.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1889,6 +1889,8 @@ int udf_setup_indirect_aext(struct inode *inode, int block,
		adsize = sizeof(struct short_ad);
		else if (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_LONG)
		adsize = sizeof(struct long_ad);
		else
		return -EIO;

		neloc.logicalBlockNum = block;
		neloc.partitionReferenceNum = epos->block.partitionReferenceNum;
		@@ -1962,6 +1964,8 @@ int __udf_add_aext(struct inode inode, struct extent_position epos,
		adsize = sizeof(struct short_ad);
		else if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG)
		adsize = sizeof(struct long_ad);
		else
		return -EIO;

		if (!epos->bh) {
		WARN_ON(iinfo->i_lenAlloc !=

Admin message