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>

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 26446eb08bd89b20e0a43d6ebfcc0f591f9d4abe..8fd697a3cf8f973e8ca616018956abf89883361b 100644 (file)
--- 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)
        phys_addr_t max_addr = 0;
        bool relocate = false;
        char seg_name[10];
-       size_t offset;
+       ssize_t offset;
        size_t size;
        void *ptr;
        int ret;

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 98b2373c3a974bc044bae8dc3b162cd02814e7de..bd63df0d14e09f9d0bbc8244c2f0e582ea98dc26 100644 (file)
--- 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,
        phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX;
        phys_addr_t max_addr = 0;
        size_t fw_name_len;
-       size_t offset;
+       ssize_t offset;
        char *fw_name;
        bool relocate = false;
        void *ptr;