Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbf7637 authored by Steve Magnani's avatar Steve Magnani Committed by Jan Kara
Browse files

udf: Fix signed/unsigned format specifiers 



Fix problems noted in compilion with -Wformat=2 -Wformat-signedness.
In particular, a mismatch between the signedness of a value and the
signedness of its format specifier can result in unsigned values being
printed as negative numbers, e.g.:

  Partition (0 type 1511) starts at physical 460, block length -1779968542

...which occurs when mounting a large (> 1 TiB) UDF partition.

Changes since V1:
* Fixed additional issues noted in udf_bitmap_free_blocks(),
  udf_get_fileident(), udf_show_options()

Signed-off-by: default avatarSteven J. Magnani <steve@digidescorp.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent b490bdd6

fs/udf/balloc.c

+6 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int __load_block_bitmap(struct super_block *sb, 
	int nr_groups = bitmap->s_nr_groups;



	if (block_group >= nr_groups) {

		udf_debug("block_group (%d) > nr_groups (%d)\n",

		udf_debug("block_group (%u) > nr_groups (%d)\n",

			  block_group, nr_groups);

	}
@@ -122,7 +122,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb, 
	partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];

	if (bloc->logicalBlockNum + count < count ||

	    (bloc->logicalBlockNum + count) > partmap->s_partition_len) {

		udf_debug("%d < %d || %d + %d > %d\n",

		udf_debug("%u < %d || %u + %u > %u\n",

			  bloc->logicalBlockNum, 0,

			  bloc->logicalBlockNum, count,

			  partmap->s_partition_len);
@@ -151,9 +151,9 @@ static void udf_bitmap_free_blocks(struct super_block *sb, 
		bh = bitmap->s_block_bitmap[bitmap_nr];

		for (i = 0; i < count; i++) {

			if (udf_set_bit(bit + i, bh->b_data)) {

				udf_debug("bit %ld already set\n", bit + i);

				udf_debug("bit %lu already set\n", bit + i);

				udf_debug("byte=%2x\n",

					  ((char *)bh->b_data)[(bit + i) >> 3]);

					  ((__u8 *)bh->b_data)[(bit + i) >> 3]);

			}

		}

		udf_add_free_space(sb, sbi->s_partition, count);
@@ -364,7 +364,7 @@ static void udf_table_free_blocks(struct super_block *sb, 
	partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];

	if (bloc->logicalBlockNum + count < count ||

	    (bloc->logicalBlockNum + count) > partmap->s_partition_len) {

		udf_debug("%d < %d || %d + %d > %d\n",

		udf_debug("%u < %d || %u + %u > %u\n",

			  bloc->logicalBlockNum, 0,

			  bloc->logicalBlockNum, count,

			  partmap->s_partition_len);
@@ -517,7 +517,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, 


	while (first_block != eloc.logicalBlockNum &&

	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {

		udf_debug("eloc=%d, elen=%d, first_block=%d\n",

		udf_debug("eloc=%u, elen=%u, first_block=%u\n",

			  eloc.logicalBlockNum, elen, first_block);

		; /* empty loop body */

	}

fs/udf/directory.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset) 
	if (fi->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FID)) {

		udf_debug("0x%x != TAG_IDENT_FID\n",

			  le16_to_cpu(fi->descTag.tagIdent));

		udf_debug("offset: %u sizeof: %lu bufsize: %u\n",

		udf_debug("offset: %d sizeof: %lu bufsize: %d\n",

			  *offset, (unsigned long)sizeof(struct fileIdentDesc),

			  bufsize);

		return NULL;

fs/udf/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -1278,14 +1278,14 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 


reread:

	if (iloc->partitionReferenceNum >= sbi->s_partitions) {

		udf_debug("partition reference: %d > logical volume partitions: %d\n",

		udf_debug("partition reference: %u > logical volume partitions: %u\n",

			  iloc->partitionReferenceNum, sbi->s_partitions);

		return -EIO;

	}



	if (iloc->logicalBlockNum >=

	    sbi->s_partmaps[iloc->partitionReferenceNum].s_partition_len) {

		udf_debug("block=%d, partition=%d out of range\n",

		udf_debug("block=%u, partition=%u out of range\n",

			  iloc->logicalBlockNum, iloc->partitionReferenceNum);

		return -EIO;

	}
@@ -1304,13 +1304,13 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
	 */

	bh = udf_read_ptagged(inode->i_sb, iloc, 0, &ident);

	if (!bh) {

		udf_err(inode->i_sb, "(ino %ld) failed !bh\n", inode->i_ino);

		udf_err(inode->i_sb, "(ino %lu) failed !bh\n", inode->i_ino);

		return -EIO;

	}



	if (ident != TAG_IDENT_FE && ident != TAG_IDENT_EFE &&

	    ident != TAG_IDENT_USE) {

		udf_err(inode->i_sb, "(ino %ld) failed ident=%d\n",

		udf_err(inode->i_sb, "(ino %lu) failed ident=%u\n",

			inode->i_ino, ident);

		goto out;

	}
@@ -1346,7 +1346,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		}

		brelse(ibh);

	} else if (fe->icbTag.strategyType != cpu_to_le16(4)) {

		udf_err(inode->i_sb, "unsupported strategy type: %d\n",

		udf_err(inode->i_sb, "unsupported strategy type: %u\n",

			le16_to_cpu(fe->icbTag.strategyType));

		goto out;

	}
@@ -1547,7 +1547,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		udf_debug("METADATA BITMAP FILE-----\n");

		break;

	default:

		udf_err(inode->i_sb, "(ino %ld) failed unknown file type=%d\n",

		udf_err(inode->i_sb, "(ino %lu) failed unknown file type=%u\n",

			inode->i_ino, fe->icbTag.fileType);

		goto out;

	}
@@ -2091,7 +2091,7 @@ int8_t udf_next_aext(struct inode *inode, struct extent_position *epos, 
		block = udf_get_lb_pblock(inode->i_sb, &epos->block, 0);

		epos->bh = udf_tread(inode->i_sb, block);

		if (!epos->bh) {

			udf_debug("reading block %d failed!\n", block);

			udf_debug("reading block %u failed!\n", block);

			return -1;

		}

	}
@@ -2146,7 +2146,7 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos, 
		*elen = le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK;

		break;

	default:

		udf_debug("alloc_type = %d unsupported\n", iinfo->i_alloc_type);

		udf_debug("alloc_type = %u unsupported\n", iinfo->i_alloc_type);

		return -1;

	}

fs/udf/misc.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, 


	bh = udf_tread(sb, block);

	if (!bh) {

		udf_err(sb, "read failed, block=%u, location=%d\n",

		udf_err(sb, "read failed, block=%u, location=%u\n",

			block, location);

		return NULL;

	}
@@ -247,7 +247,7 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, 
					le16_to_cpu(tag_p->descCRCLength)))

		return bh;



	udf_debug("Crc failure block %d: crc = %d, crclen = %d\n", block,

	udf_debug("Crc failure block %u: crc = %u, crclen = %u\n", block,

		  le16_to_cpu(tag_p->descCRC),

		  le16_to_cpu(tag_p->descCRCLength));

error_out:

fs/udf/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) 
	if (retval)

		goto end_rmdir;

	if (inode->i_nlink != 2)

		udf_warn(inode->i_sb, "empty directory has nlink != 2 (%d)\n",

		udf_warn(inode->i_sb, "empty directory has nlink != 2 (%u)\n",

			 inode->i_nlink);

	clear_nlink(inode);

	inode->i_size = 0;
@@ -882,7 +882,7 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry) 
		goto end_unlink;



	if (!inode->i_nlink) {

		udf_debug("Deleting nonexistent file (%lu), %d\n",

		udf_debug("Deleting nonexistent file (%lu), %u\n",

			  inode->i_ino, inode->i_nlink);

		set_nlink(inode, 1);

	}