aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElaine Wang <elaine.wang@intel.com>2012-12-27 16:04:02 +0800
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:01:46 -0700
commit6f2c71fc4f82da090495374fd3386f237192743c (patch)
treeb884b6eb6fed71f0411537df76ba009dd61bb188
parent03d3b908352289198fc0556e44a168eab7ef2aec (diff)
downloadlibwsbm-6f2c71fc4f82da090495374fd3386f237192743c.tar.gz
Fix klocwork issues
BZ: 77254 Check the return value of calloc. Fix NULL pointer dereference risk. Signed-off-by: Elaine Wang <elaine.wang@intel.com> Change-Id: Ie877bf092e366f59ffa05f39f0d51d5c5d0c2199 Reviewed-on: http://android.intel.com:8080/83994 Reviewed-by: Wang, Elaine <elaine.wang@intel.com> Reviewed-by: Yuan, Shengquan <shengquan.yuan@intel.com> Reviewed-by: Shi, PingX <pingx.shi@intel.com> Tested-by: Shi, PingX <pingx.shi@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com>
-rw-r--r--src/wsbm_manager.c2
-rw-r--r--src/wsbm_userpool.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/wsbm_manager.c b/src/wsbm_manager.c
index a86b894..e95309d 100644
--- a/src/wsbm_manager.c
+++ b/src/wsbm_manager.c
@@ -1011,6 +1011,8 @@ wsbmBOCreateList(int target, int hasKernelBuffers)
struct _WsbmBufferList *list = calloc(sizeof(*list), 1);
int ret;
+ if (!list)
+ return NULL;
list->hasKernelBuffers = hasKernelBuffers;
if (hasKernelBuffers) {
ret = validateCreateList(target, &list->kernelBuffers, 0);
diff --git a/src/wsbm_userpool.c b/src/wsbm_userpool.c
index f7833b7..9c7b79a 100644
--- a/src/wsbm_userpool.c
+++ b/src/wsbm_userpool.c
@@ -339,7 +339,7 @@ pool_validate(struct _WsbmBufStorage *buf, uint64_t set_flags,
vBuf->node =
wsbmMMGetBlock(vBuf->node, vBuf->size, vBuf->alignment);
- if (!err) {
+ if (!err && vBuf->node) {
vBuf->kBuf.placement = WSBM_PL_FLAG_VRAM;
vBuf->kBuf.gpuOffset = p->vramOffset + vBuf->node->start;
vBuf->map = (void *)(p->vramMap + vBuf->node->start);