* [PATCH] soc: qcom: mdt_loader: Detect truncated read of segments
@ 2021-01-07 23:25 Bjorn Andersson
2021-04-08 11:01 ` Sibi Sankar
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Andersson @ 2021-01-07 23:25 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Siddharth Gupta; +Cc: linux-arm-msm, linux-kernel
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()")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/soc/qcom/mdt_loader.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 24cd193dec55..e01d18e9ad2b 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -253,6 +253,14 @@ 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);
+ ret = -EINVAL;
+ break;
+ }
+
release_firmware(seg_fw);
}
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] soc: qcom: mdt_loader: Detect truncated read of segments
2021-01-07 23:25 [PATCH] soc: qcom: mdt_loader: Detect truncated read of segments Bjorn Andersson
@ 2021-04-08 11:01 ` Sibi Sankar
0 siblings, 0 replies; 2+ messages in thread
From: Sibi Sankar @ 2021-04-08 11:01 UTC (permalink / raw)
To: Bjorn Andersson, Andy Gross, Siddharth Gupta; +Cc: linux-arm-msm, linux-kernel
Hey Bjorn,
Thanks for the patch!
On 1/8/21 4:55 AM, Bjorn Andersson wrote:
> 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()")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> drivers/soc/qcom/mdt_loader.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
> index 24cd193dec55..e01d18e9ad2b 100644
> --- a/drivers/soc/qcom/mdt_loader.c
> +++ b/drivers/soc/qcom/mdt_loader.c
> @@ -253,6 +253,14 @@ 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);
> + ret = -EINVAL;
> + break;
seg_fw has to be released on error condition as well.
With ^^ fixed you can have my R-b.
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
> + }
> +
> release_firmware(seg_fw);
> }
>
>
--
Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc, is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-08 11:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-07 23:25 [PATCH] soc: qcom: mdt_loader: Detect truncated read of segments Bjorn Andersson
2021-04-08 11:01 ` Sibi Sankar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).