diff options
| author | Bjorn Andersson <[email protected]> | 2025-06-11 02:58:29 +0000 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2025-06-17 03:19:53 +0000 |
| commit | cd840362b0a7b3da59740c1380b18ce0ccf8c264 (patch) | |
| tree | 74a7d41baf49c0afa5f9fbc1c7821db317d55611 | |
| parent | soc: qcom: mdt_loader: Ensure we don't read past the ELF header (diff) | |
| download | kernel-cd840362b0a7b3da59740c1380b18ce0ccf8c264.tar.gz kernel-cd840362b0a7b3da59740c1380b18ce0ccf8c264.zip | |
soc: qcom: mdt_loader: Rename mdt_phdr_valid()
The function checks if a program header refers to a PT_LOAD segment,
that isn't a hash segment (which should be PT_LOAD in the first place),
andwith non-zero size. That's not the definition of "valid", but rather
if it's "loadable".
Rename the function to reflect what it does.
Reviewed-by: Dmitry Baryshkov <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>
Link: https://lore.kernel.org/r/20250610-mdt-loader-validation-and-fixes-v2-2-f7073e9ab899@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <[email protected]>
| -rw-r--r-- | drivers/soc/qcom/mdt_loader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index b2c9731b6f2a..52f0c8bb7c5e 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -49,7 +49,7 @@ static bool mdt_header_valid(const struct firmware *fw) return true; } -static bool mdt_phdr_valid(const struct elf32_phdr *phdr) +static bool mdt_phdr_loadable(const struct elf32_phdr *phdr) { if (phdr->p_type != PT_LOAD) return false; @@ -122,7 +122,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw) for (i = 0; i < ehdr->e_phnum; i++) { phdr = &phdrs[i]; - if (!mdt_phdr_valid(phdr)) + if (!mdt_phdr_loadable(phdr)) continue; if (phdr->p_paddr < min_addr) @@ -260,7 +260,7 @@ int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw, for (i = 0; i < ehdr->e_phnum; i++) { phdr = &phdrs[i]; - if (!mdt_phdr_valid(phdr)) + if (!mdt_phdr_loadable(phdr)) continue; if (phdr->p_flags & QCOM_MDT_RELOCATABLE) @@ -360,7 +360,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, for (i = 0; i < ehdr->e_phnum; i++) { phdr = &phdrs[i]; - if (!mdt_phdr_valid(phdr)) + if (!mdt_phdr_loadable(phdr)) continue; if (phdr->p_flags & QCOM_MDT_RELOCATABLE) @@ -387,7 +387,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, for (i = 0; i < ehdr->e_phnum; i++) { phdr = &phdrs[i]; - if (!mdt_phdr_valid(phdr)) + if (!mdt_phdr_loadable(phdr)) continue; offset = phdr->p_paddr - mem_reloc; |