* [PATCH] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz
@ 2021-01-07 23:31 Bjorn Andersson
2021-04-08 11:18 ` Sibi Sankar
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Andersson @ 2021-01-07 23:31 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Siddharth Gupta; +Cc: linux-arm-msm, linux-kernel
The code validates that segments of p_memsz bytes of a segment will fit
in the provided memory region, but does not validate that p_filesz bytes
will, which means that an incorrectly crafted ELF header might write
beyond the provided memory region.
Fixes: 051fb70fd4ea ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5")
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 e01d18e9ad2b..5180b5996830 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -230,6 +230,14 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
break;
}
+ if (phdr->p_filesz > phdr->p_memsz) {
+ dev_err(dev,
+ "refusing to load segment %d with p_filesz > p_memsz\n",
+ i);
+ ret = -EINVAL;
+ break;
+ }
+
ptr = mem_region + offset;
if (phdr->p_filesz && phdr->p_offset < fw->size) {
--
2.29.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz
2021-01-07 23:31 [PATCH] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz Bjorn Andersson
@ 2021-04-08 11:18 ` Sibi Sankar
0 siblings, 0 replies; 2+ messages in thread
From: Sibi Sankar @ 2021-04-08 11:18 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 5:01 AM, Bjorn Andersson wrote:
> The code validates that segments of p_memsz bytes of a segment will fit
> in the provided memory region, but does not validate that p_filesz bytes
> will, which means that an incorrectly crafted ELF header might write
> beyond the provided memory region.
>
> Fixes: 051fb70fd4ea ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5")
> 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 e01d18e9ad2b..5180b5996830 100644
> --- a/drivers/soc/qcom/mdt_loader.c
> +++ b/drivers/soc/qcom/mdt_loader.c
> @@ -230,6 +230,14 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
> break;
> }
>
> + if (phdr->p_filesz > phdr->p_memsz) {
> + dev_err(dev,
> + "refusing to load segment %d with p_filesz > p_memsz\n",
> + i);
> + ret = -EINVAL;
> + break;
> + }
> +
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
> ptr = mem_region + offset;
>
> if (phdr->p_filesz && phdr->p_offset < fw->size) {
>
--
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:18 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:31 [PATCH] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz Bjorn Andersson
2021-04-08 11:18 ` Sibi Sankar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®