aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Hu <austin.hu@intel.com>2017-05-04 11:20:30 +0800
committerDaniel Cardenas <danielcar@google.com>2017-05-08 20:08:34 -0700
commitba6cd22cc9dbadb14dad331ef6ddc8b1e403a654 (patch)
tree48c380536179899be66fe245127e0bc1a97da7d5
parentac747113d4f6739b1462ca7fb40f2091691e209b (diff)
downloadlibwsbm-ba6cd22cc9dbadb14dad331ef6ddc8b1e403a654.tar.gz
Fixed Klocwork erros.android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
BZ: IMINAN-51481 Fixes: 38135184 Test: Netflix, play movies, youtube Change-Id: Ica82a8be2088e42d36add13bdead4fb7469619cf Signed-off-by: Austin Hu <austin.hu@intel.com> (cherry picked from commit 7440034b901f93a56dd35aca5745ce21f62d37b7)
-rw-r--r--src/wsbm_manager.c13
-rw-r--r--src/wsbm_slabpool.c4
2 files changed, 12 insertions, 5 deletions
diff --git a/src/wsbm_manager.c b/src/wsbm_manager.c
index 0cbf9de..877abc6 100644
--- a/src/wsbm_manager.c
+++ b/src/wsbm_manager.c
@@ -1015,15 +1015,18 @@ wsbmBOCreateList(int target, int hasKernelBuffers)
return NULL;
list->hasKernelBuffers = hasKernelBuffers;
if (hasKernelBuffers) {
- ret = validateCreateList(target, &list->kernelBuffers, 0);
- if (ret)
- return NULL;
+ ret = validateCreateList(target, &list->kernelBuffers, 0);
+ if (ret) {
+ free(list);
+ return NULL;
+ }
}
ret = validateCreateList(target, &list->userBuffers, 1);
if (ret) {
- validateFreeList(&list->kernelBuffers);
- return NULL;
+ validateFreeList(&list->kernelBuffers);
+ free(list);
+ return NULL;
}
return list;
diff --git a/src/wsbm_slabpool.c b/src/wsbm_slabpool.c
index ec6638b..1e551e3 100644
--- a/src/wsbm_slabpool.c
+++ b/src/wsbm_slabpool.c
@@ -463,6 +463,10 @@ wsbmAllocSlab(struct _WsbmSlabSizeHeader *header)
}
numBuffers = slab->kbo->actualSize / header->bufSize;
+ if (!numBuffers) {
+ ret = -ENOMEM;
+ goto out_err1;
+ }
slab->buffers = calloc(numBuffers, sizeof(*slab->buffers));
if (!slab->buffers) {