| Message ID | 20170215220041.3077-1-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Feb 15, 2017 at 02:00:41PM -0800, Bjorn Andersson wrote: > 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> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Andy Gross <andy.gross@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) 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 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, 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;
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> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/remoteproc/qcom_q6v5_pil.c | 2 +- drivers/soc/qcom/mdt_loader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)