samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

qcacmn: Fix a memory leak in qdf_mem_shared_mem_alloc

瀏覽代碼 
qdf_mem_shared_mem_alloc invokes qdf_mem_dma_get_sgtable which will alloc
memory.
This memory should be free in qdf_mem_shared_mem_free by sg_free_table.

Change-Id: I3ad4bd2ff7a80d4051f15dcb04e0265707c2712d
CRs-Fixed: 2131270
This commit is contained in:
Jiachao Wu
2017-10-23 14:41:19 +08:00
committed by nshrivas
父節點 b5ec642075
當前提交 ae6c777bd1
共有 3 個文件被更改，包括 79 次插入 和 44 次删除
Download Patch File Download Diff File Expand all files Collapse all files

59
qdf/inc/qdf_mem.h
查看文件

@@ -568,11 +568,23 @@ qdf_mem_dma_get_sgtable(struct device *dev, void *sgt, void *cpu_addr,
return __qdf_os_mem_dma_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
}
/**
* qdf_mem_free_sgtable() - Free a previously allocated sg table
* @sgt: the mapped sg table header
*
* Return: None
*/
static inline void
qdf_mem_free_sgtable(struct sg_table *sgt)
{
__qdf_os_mem_free_sgtable(sgt);
}
/**
* qdf_dma_get_sgtable_dma_addr() - Assigns DMA address to scatterlist elements
* @sgt: scatter gather table pointer
*
* @Return: None
* Return: None
*/
static inline void
qdf_dma_get_sgtable_dma_addr(struct sg_table *sgt)
@@ -683,49 +695,9 @@ qdf_mem_set_dma_pa(qdf_device_t osdev,
* Allocate DMA memory which will be shared with external kernel module. This
* information is needed for SMMU mapping.
*
* Return: 0 suceess
* Return: 0 success
*/
static inline qdf_shared_mem_t *qdf_mem_shared_mem_alloc(qdf_device_t osdev,
uint32_t size)
{
qdf_shared_mem_t *shared_mem;
shared_mem = qdf_mem_malloc(sizeof(*shared_mem));
if (!shared_mem) {
__qdf_print("%s: Unable to allocate memory for shared resource struct\n",
__func__);
return NULL;
}
shared_mem->vaddr = qdf_mem_alloc_consistent(osdev, osdev->dev,
size, qdf_mem_get_dma_addr_ptr(osdev,
&shared_mem->mem_info));
if (!shared_mem->vaddr) {
__qdf_print("%s; Unable to allocate DMA memory for shared resource\n",
__func__);
qdf_mem_free(shared_mem);
return NULL;
}
qdf_mem_set_dma_size(osdev, &shared_mem->mem_info, size);
qdf_mem_zero(shared_mem->vaddr,
qdf_mem_get_dma_size(osdev, &shared_mem->mem_info));
qdf_mem_set_dma_pa(osdev, &shared_mem->mem_info,
qdf_mem_paddr_from_dmaaddr(osdev,
qdf_mem_get_dma_addr(osdev,
&shared_mem->mem_info)));
qdf_mem_dma_get_sgtable(osdev->dev,
(void *)&shared_mem->sgtable,
shared_mem->vaddr,
qdf_mem_get_dma_addr(osdev,
&shared_mem->mem_info),
qdf_mem_get_dma_size(osdev,
&shared_mem->mem_info));
qdf_dma_get_sgtable_dma_addr(&shared_mem->sgtable);
return shared_mem;
}
qdf_shared_mem_t *qdf_mem_shared_mem_alloc(qdf_device_t osdev, uint32_t size);
/**
* qdf_mem_shared_mem_free() - Free shared memory
@@ -755,6 +727,7 @@ static inline void qdf_mem_shared_mem_free(qdf_device_t osdev,
qdf_get_dma_mem_context(shared_mem,
memctx));
}
qdf_mem_free_sgtable(&shared_mem->sgtable);
qdf_mem_free(shared_mem);
}