Unverified Commit e6e70990 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-fixes-for-6.17' of... 

Merge tag 'qcom-drivers-fixes-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm driver fixes for v6.17-rc1

The recently extended sanity checks for the Qualcomm firmware files
turned out to be too restrictive, preventing a variety of firmware
images from being loaded. Adjust the checks to allow section header
sizes of 0 when sections aren't used.

* tag 'qcom-drivers-fixes-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: mdt_loader: Deal with zero e_shentsize

Link: https://lore.kernel.org/r/20250811145613.120917-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1b237f19 25daf9af

drivers/soc/qcom/mdt_loader.c

+7 −5
Original line number Diff line number Diff line
@@ -39,12 +39,14 @@ static bool mdt_header_valid(const struct firmware *fw) 
	if (phend > fw->size)

		return false;



	if (ehdr->e_shentsize || ehdr->e_shnum) {

		if (ehdr->e_shentsize != sizeof(struct elf32_shdr))

			return false;



		shend = size_add(size_mul(sizeof(struct elf32_shdr), ehdr->e_shnum), ehdr->e_shoff);

		if (shend > fw->size)

			return false;

	}



	return true;

}