Re: [PATCH 01/11] common: filetype: add detection for x86 Linux kernel images

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

Hi,

On 10/6/25 6:15 AM, chalianis1@gmail.com wrote:
> From: Chali Anis <chalianis1@gmail.com>
> 
> Introduce a new filetype for x86 Linux kernel images by checking for
> the "HdrS" magic (0x53726448) at offset 0x202 in the setup header.
> 
> Signed-off-by: Chali Anis <chalianis1@gmail.com>

This introduces intermittent breakage, which can complicate e.g. git
bisect. I suggest this patch be squashed into patch 07/11.

Alternatively, the hunk registering the binfmt and bootm handlers
need to be moved into this patch here.

Cheers,
Ahmad

> ---
>  common/filetype.c  | 3 +++
>  include/filetype.h | 6 ++++++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/common/filetype.c b/common/filetype.c
> index eb397a175cb6..72f84442cae9 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -87,6 +87,7 @@ static const struct filetype_str filetype_str[] = {
>  	[filetype_zstd_compressed] = { "ZSTD compressed", "zstd" },
>  	[filetype_rockchip_rkss_image] = { "Rockchip signed boot image",
>  					   "rk-image" },
> +	[filetype_x86_linux_image] = { "x86 Linux image", "x86-linux" },
>  };
>  
>  static const char *file_type_to_nr_string(enum filetype f)
> @@ -435,6 +436,8 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
>  		return is_dos_exe(buf8) ? filetype_riscv_efi_linux_image : filetype_riscv_linux_image;
>  	if (is_riscv_linux_bootimage(buf) && !memcmp(&buf[12], "barebox", 8))
>  		return filetype_riscv_barebox_image;
> +	if (bufsize > 0x206 && is_x86_linux_bootimage(buf))
> +		return filetype_x86_linux_image;
>  
>  	if (le32_to_cpu(buf[5]) == 0x504d5453)
>  		return filetype_mxs_bootstream;
> diff --git a/include/filetype.h b/include/filetype.h
> index 6f4a103df304..ff4d54ee3c45 100644
> --- a/include/filetype.h
> +++ b/include/filetype.h
> @@ -67,6 +67,7 @@ enum filetype {
>  	filetype_nxp_fspi_image,
>  	filetype_zstd_compressed,
>  	filetype_rockchip_rkss_image,
> +	filetype_x86_linux_image,
>  	filetype_max,
>  };
>  
> @@ -150,4 +151,9 @@ static inline bool is_riscv_linux_bootimage(const void *header)
>  	return le32_to_cpup(header + 56) == 0x05435352;
>  }
>  
> +static inline bool is_x86_linux_bootimage(const void *header)
> +{
> +	return le32_to_cpup(header + 0x202) == 0x53726448;
> +}
> +
>  #endif /* __FILE_TYPE_H */

-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |