evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: pil: Avoid possible buffer overflow"

Browse source
This commit is contained in:
Linux Build Service Account 2017-09-27 20:05:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit dc908f16a5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/soc/qcom/pil-msa.c
View file

@ -559,7 +559,7 @@ int pil_mss_reset_load_mba(struct pil_desc *pil)
char *fw_name_p;
void *mba_dp_virt;
dma_addr_t mba_dp_phys, mba_dp_phys_end;
int ret, count;
int ret;
const u8 *data;
struct device *dma_dev = md->mba_mem_dev_fixed ?: &md->mba_mem_dev;
@ -624,10 +624,9 @@ int pil_mss_reset_load_mba(struct pil_desc *pil)
&mba_dp_phys, &mba_dp_phys_end, drv->mba_dp_size);
/* Load the MBA image into memory */
count = fw->size;
if (count <= SZ_1M) {
if (fw->size <= SZ_1M) {
/* Ensures memcpy is done for max 1MB fw size */
memcpy(mba_dp_virt, data, count);
memcpy(mba_dp_virt, data, fw->size);
} else {
dev_err(pil->dev, "%s fw image loading into memory is failed due to fw size overflow\n",
__func__);