diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2021-01-07 15:25:26 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:59:30 +0200 |
| commit | 91a63477c9c55d286263034cda87686c754f455e (patch) | |
| tree | d0c1ff6215a37b310bb42ec5f08602e0c8e7e618 /drivers/soc | |
| parent | 26a6fab625b1de05845a5c363dfbf8a3be70269d (diff) | |
| download | linux-stable-91a63477c9c55d286263034cda87686c754f455e.tar.gz linux-stable-91a63477c9c55d286263034cda87686c754f455e.tar.bz2 linux-stable-91a63477c9c55d286263034cda87686c754f455e.zip | |
soc: qcom: mdt_loader: Detect truncated read of segments
[ Upstream commit 0648c55e3a21ccd816e99b6600d6199fbf39d23a ]
Given that no validation of how much data the firmware loader read in
for a given segment truncated segment files would best case result in a
hash verification failure, without any indication of what went wrong.
Improve this by validating that the firmware loader did return the
amount of data requested.
Fixes: 445c2410a449 ("soc: qcom: mdt_loader: Use request_firmware_into_buf()")
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/20210107232526.716989-1-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/mdt_loader.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 7584b81d06a1..47dffe7736ff 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -187,6 +187,15 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, break; } + if (seg_fw->size != phdr->p_filesz) { + dev_err(dev, + "failed to load segment %d from truncated file %s\n", + i, fw_name); + release_firmware(seg_fw); + ret = -EINVAL; + break; + } + release_firmware(seg_fw); } |