soc: qcom: mdt_loader: Fix split-firmware condition
authorBjorn Andersson <bjorn.andersson@linaro.org>
Tue, 15 Feb 2022 03:48:19 +0000 (19:48 -0800)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Wed, 23 Feb 2022 19:13:12 +0000 (13:13 -0600)
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 <bjorn.andersson@linaro.org>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20220215034819.1209367-1-bjorn.andersson@linaro.org
drivers/soc/qcom/mdt_loader.c

index f0b1d969567c6e2674eca6fb407bc3c2f4df86d8..366db493579b0463608f0f6be5abca748ce4685c 100644 (file)
@@ -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",