From: Bjorn Andersson Date: Tue, 15 Feb 2022 03:48:19 +0000 (-0800) Subject: soc: qcom: mdt_loader: Fix split-firmware condition X-Git-Tag: v5.18-rc1~146^2~6^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a1b019872693c74d919db4e267f451fc7af9a21c;p=linux-block.git soc: qcom: mdt_loader: Fix split-firmware condition The updated condition checking if a segment can be found in the loaded firmware blob, or need to be loaded from a separate file, incorrectly classifies segments that ends at the end of the loaded blob. The result is that the mdt loader attempts to load the segment from a separate file. Correct the conditional to use the loaded segment instead. Fixes: ea90330fa329 ("soc: qcom: mdt_loader: Extend check for split firmware") Signed-off-by: Bjorn Andersson Reviewed-by: Vinod Koul Link: https://lore.kernel.org/r/20220215034819.1209367-1-bjorn.andersson@linaro.org --- diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index f0b1d969567c..366db493579b 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -329,7 +329,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, ptr = mem_region + offset; if (phdr->p_filesz && phdr->p_offset < fw->size && - phdr->p_offset + phdr->p_filesz < fw->size) { + phdr->p_offset + phdr->p_filesz <= fw->size) { /* Firmware is large enough to be non-split */ if (phdr->p_offset + phdr->p_filesz > fw->size) { dev_err(dev, "file %s segment %d would be truncated\n",