samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cnss_prealloc: Add null pointer check before accessing memory pool

Browse Source 
Pointer for memory pool may be null if it fails to
create memory pool in cnss_pool_init().
Add null pointer check before accessing memory pool.

Change-Id: I8ae2b6a5193cffdcba3990b238178a1b93297925
CRs-Fixed: 3332360
This commit is contained in:
Yu Wang
2022-11-09 16:32:58 +08:00
committed by Madan Koyyalamudi
parent 39a9deb49b
commit 44ad9ad95f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cnss_prealloc/cnss_prealloc.c
View File

@@ -240,7 +240,7 @@ void *wcnss_prealloc_get(size_t size)
if (size >= cnss_pool_alloc_threshold()) { if (size >= cnss_pool_alloc_threshold()) {
for (i = 0; i < ARRAY_SIZE(cnss_pools); i++) { for (i = 0; i < ARRAY_SIZE(cnss_pools); i++) {
if (cnss_pools[i].size >= size) { if (cnss_pools[i].size >= size && cnss_pools[i].mp) {
mem = mempool_alloc(cnss_pools[i].mp, gfp_mask); mem = mempool_alloc(cnss_pools[i].mp, gfp_mask);
if (mem) { if (mem) {
cnss_pool_put_cache_in_mem(mem, cnss_pools[i].cache); cnss_pool_put_cache_in_mem(mem, cnss_pools[i].cache);
@@ -277,8 +277,7 @@ int wcnss_prealloc_put(void *mem)
return 0; return 0;
i = cnss_pool_get_index(mem); i = cnss_pool_get_index(mem);
if (i >= 0 && i < ARRAY_SIZE(cnss_pools) && cnss_pools[i].mp) {
if (i >= 0 && i < ARRAY_SIZE(cnss_pools)) {
mempool_free(mem, cnss_pools[i].mp); mempool_free(mem, cnss_pools[i].mp);
return 1; return 1;
} }