Skip to contentSkip to conversation

remoteproc: qcom: mdt_loader: Use signed type for offset

PATCH In review Bjorn Andersson 2 participants 2 messages Feb 15, 2017 – Feb 17, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/remoteproc/qcom_q6v5_pil.c | 2 +-
 drivers/soc/qcom/mdt_loader.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/qcom_q6v5_pil.c +1 -1
index 26446eb08bd8..8fd697a3cf8f 100644
@@ -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;
drivers/soc/qcom/mdt_loader.c +1 -1
index 98b2373c3a97..bd63df0d14e0 100644
@@ -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;
Signature · 1 line
2.11.0
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Bjorn Andersson

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.

Quoted 7 lines

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")