Skip to contentSkip to conversation

linux-next: build warning after merge of the akpm tree

PATCH In review Stephen Rothwell 2 participants 4 messages Feb 20, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc ppc44x_defconfig) produced this warning:

block/partitions/efi.c: In function 'is_gpt_valid':
block/partitions/efi.c:324:3: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat]

Introduced by commit ef25bb0fa6e2 ("block/partitions/efi.c: ensure that the GPT header is at least the size of the structure").

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#1 lore raw

Stephen,

The following email is an updated patch which should fix the warning you're seeing on architectures where sizeof is unsigned int rather than unsigned long.

This completely replaces the ef25bb0fa6e2 patch. Andrew, if you'd prefer a single-line fixup patch, I can send you that instead.

#2 lore raw

PATCH 1/1 block/partitions/efi.c: ensure that the GPT header is at least the size of the structure.

UEFI 2.3.1D will include a change to the spec language mandating that a GPT header must be greater than *or equal to* the size of the defined structure. While verifying that this would work on Linux, I discovered that we're not actually checking the minimum bound at all.

The result of this is that when we verify the checksum, it's possible that on a malformed header (with header_size of 0), we won't actually verify any data.

Cc Matt Fleming <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Andrew Morton <[email protected]>
---
 block/partitions/efi.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
block/partitions/efi.c +10 -2
index b62fb88..62e05cf 100644
@@ -310,15 +310,23 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
 		goto fail;
 	}
 
-	/* Check the GUID Partition Table header size */
+	/* Check the GUID Partition Table header size is too big */
 	if (le32_to_cpu((*gpt)->header_size) >
 			bdev_logical_block_size(state->bdev)) {
-		pr_debug("GUID Partition Table Header size is wrong: %u > %u\n",
+		pr_debug("GUID Partition Table Header size is too large: %u > %u\n",
 			le32_to_cpu((*gpt)->header_size),
 			bdev_logical_block_size(state->bdev));
 		goto fail;
 	}
 
+	/* Check the GUID Partition Table header size is too small */
+	if (le32_to_cpu((*gpt)->header_size) < sizeof(gpt_header)) {
+		pr_debug("GUID Partition Table Header size is too small: %u < %lu\n",
+			le32_to_cpu((*gpt)->header_size),
+			(unsigned long)sizeof(gpt_header));
+		goto fail;
+	}
+
 	/* Check the GUID Partition Table CRC */
 	origcrc = le32_to_cpu((*gpt)->header_crc32);
 	(*gpt)->header_crc32 = 0;
Signature · 1 line
1.8.1.2
#3 lore raw

Re: [PATCH] block/partitions/efi.c: ensure that the GPT header is at least the size of the structure.

Hi Peter,

block/partitions/efi.c static int is_gpt_valid(struct parsed_partitions *state, u64 lba, · line 326

Quoted 6 lines · On Wed, 20 Feb 2013 09:37:01 -0500 Peter Jones <[email protected]> wrote:
block/partitions/efi.c +5 -0
+	/* Check the GUID Partition Table header size is too small */
+	if (le32_to_cpu((*gpt)->header_size) < sizeof(gpt_header)) {
+		pr_debug("GUID Partition Table Header size is too small: %u < %lu\n",
+			le32_to_cpu((*gpt)->header_size),
+			(unsigned long)sizeof(gpt_header));

Don't do this. We have %zu to print size_t variables ...

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]