aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2017-02-15 17:00:41 -0500
committerBjorn Andersson <bjorn.andersson@linaro.org>2017-02-22 05:07:13 -0500
commit01625cc5e65f420dbea57f7de6b9552a0f807a84 (patch)
treedb133dd5046653862d136263a1238a185278d84a
parent231c8dfd1a9ff530869e1327ba4168dbe592f3f9 (diff)
remoteproc: qcom: mdt_loader: Use signed type for offset
In the transition from using rproc_da_to_va(), the type of the load offset became unsigned. This causes the subsequent check to let negative values less than p_memsz + mem_size through and we write outside of the buffer. Change the type back to a signed value to catch this. Fixes: 7f0dd07a9b29 ("remoteproc: qcom: mdt_loader: Refactor MDT loader") Fixes: e7fd25226295 ("remoteproc: qcom: q6v5: Decouple driver from MDT loader") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reported-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> Acked-by: Andy Gross <andy.gross@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r--drivers/remoteproc/qcom_q6v5_pil.c2
-rw-r--r--drivers/soc/qcom/mdt_loader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 26446eb08bd8..8fd697a3cf8f 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -502,7 +502,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
502 phys_addr_t max_addr = 0; 502 phys_addr_t max_addr = 0;
503 bool relocate = false; 503 bool relocate = false;
504 char seg_name[10]; 504 char seg_name[10];
505 size_t offset; 505 ssize_t offset;
506 size_t size; 506 size_t size;
507 void *ptr; 507 void *ptr;
508 int ret; 508 int ret;
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 98b2373c3a97..bd63df0d14e0 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -98,7 +98,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
98 phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; 98 phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX;
99 phys_addr_t max_addr = 0; 99 phys_addr_t max_addr = 0;
100 size_t fw_name_len; 100 size_t fw_name_len;
101 size_t offset; 101 ssize_t offset;
102 char *fw_name; 102 char *fw_name;
103 bool relocate = false; 103 bool relocate = false;
104 void *ptr; 104 void *ptr;