Skip to content

Commit fa725a4

Browse files
quic-bjorandegregkh
authored andcommitted
soc: qcom: mdt_loader: Deal with zero e_shentsize
commit 25daf9a upstream. Firmware that doesn't provide section headers leave both e_shentsize and e_shnum 0, which obvious isn't compatible with the newly introduced stricter checks. Make the section-related checks conditional on either of these values being non-zero. Fixes: 9f9967f ("soc: qcom: mdt_loader: Ensure we don't read past the ELF header") Reported-by: Val Packett <val@packett.cool> Closes: https://lore.kernel.org/all/ece307c3-7d65-440f-babd-88cf9705b908@packett.cool/ Reported-by: Neil Armstrong <neil.armstrong@linaro.org> Closes: https://lore.kernel.org/all/aec9cd03-6fc2-4dc8-b937-8b7cf7bf4128@linaro.org/ Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com> Fixes: 9f35ab0 ("soc: qcom: mdt_loader: Fix error return values in mdt_header_valid()") Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250730-mdt-loader-shentsize-zero-v1-1-04f43186229c@oss.qualcomm.com Signed-off-by: Bjorn Andersson <andersson@kernel.org> Cc: Yongqin Liu <yongqin.liu@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9ef594d commit fa725a4

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/soc/qcom/mdt_loader.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ static bool mdt_header_valid(const struct firmware *fw)
3838
if (phend > fw->size)
3939
return false;
4040

41-
if (ehdr->e_shentsize != sizeof(struct elf32_shdr))
42-
return false;
41+
if (ehdr->e_shentsize || ehdr->e_shnum) {
42+
if (ehdr->e_shentsize != sizeof(struct elf32_shdr))
43+
return false;
4344

44-
shend = size_add(size_mul(sizeof(struct elf32_shdr), ehdr->e_shnum), ehdr->e_shoff);
45-
if (shend > fw->size)
46-
return false;
45+
shend = size_add(size_mul(sizeof(struct elf32_shdr), ehdr->e_shnum), ehdr->e_shoff);
46+
if (shend > fw->size)
47+
return false;
48+
}
4749

4850
return true;
4951
}

0 commit comments

Comments
 (0)