Re: [PATCH v2] partitions/efi: treat size mismatch as a warning,not an error

[Davidlohr Bueso]

On Fri, 2013-10-11 at 08:47 -0700, Doug Anderson wrote:
> In (27a7c64 partitions/efi: account for pmbr size in lba) we started
> treating bad sizes in lba field of the partition that has the 0xEE
> (GPT protective) as errors.  However, we may run into these "bad
> sizes" in the real world if someone uses dd to copy an image from a
> smaller disk to a bigger disk.  Since this case used to work (even
> without using force_gpt), keep it working and treat the size mismatch
> as a warning instead of an error.
> 
> Reported-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
> Reported-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> Signed-off-by: Doug Anderson <dianders@xxxxxxxxxxxx>
> Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>

Acked-by: Davidlohr Bueso <davidlohr@xxxxxx>

Andrew, could you queue this up?

Thanks,
Davidlohr

> ---
> Changes in v2:
> - Cleaned up comments/warning as per Davidlohr.
> 
>  block/partitions/efi.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/block/partitions/efi.c b/block/partitions/efi.c
> index 1eb09ee..a8287b4 100644
> --- a/block/partitions/efi.c
> +++ b/block/partitions/efi.c
> @@ -222,11 +222,16 @@ check_hybrid:
>  	 * the disk size.
>  	 *
>  	 * Hybrid MBRs do not necessarily comply with this.
> +	 *
> +	 * Consider a bad value here to be a warning to support dd'ing
> +	 * an image from a smaller disk to a larger disk.
>  	 */
>  	if (ret == GPT_MBR_PROTECTIVE) {
>  		sz = le32_to_cpu(mbr->partition_record[part].size_in_lba);
>  		if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF)
> -			ret = 0;
> +			pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n",
> +				 sz, min_t(uint32_t,
> +					   total_sectors - 1, 0xFFFFFFFF));
>  	}
>  done:
>  	return ret;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/