mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 20:03:33 -04:00
Merge "dsp: add change to fix use-after-free issue"
This commit is contained in:
commit
8148965cc4
1 changed files with 8 additions and 1 deletions
|
|
@ -93,7 +93,7 @@ static int msm_audio_dma_buf_map(struct dma_buf *dma_buf,
|
|||
bool cma_mem)
|
||||
{
|
||||
|
||||
struct msm_audio_alloc_data *alloc_data;
|
||||
struct msm_audio_alloc_data *alloc_data = NULL;
|
||||
struct device *cb_dev;
|
||||
unsigned long ionflag = 0;
|
||||
int rc = 0;
|
||||
|
|
@ -162,6 +162,7 @@ detach_dma_buf:
|
|||
alloc_data->attach);
|
||||
free_alloc_data:
|
||||
kfree(alloc_data);
|
||||
alloc_data = NULL;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
|
@ -204,6 +205,7 @@ static int msm_audio_dma_buf_unmap(struct dma_buf *dma_buf, bool cma_mem)
|
|||
|
||||
list_del(&(alloc_data->list));
|
||||
kfree(alloc_data);
|
||||
alloc_data = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -507,6 +509,11 @@ static int msm_audio_ion_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
|
|||
{
|
||||
int rc = 0;
|
||||
|
||||
if (!dma_buf || !paddr || !vaddr || !plen) {
|
||||
pr_err("%s: Invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
rc = msm_audio_ion_get_phys(dma_buf, paddr, plen);
|
||||
if (rc) {
|
||||
pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue