SDOCM00112117: Resolve Coverity Warnings for HPLIB

diff --git a/ti/runtime/hplib/hplib_util.h b/ti/runtime/hplib/hplib_util.h
index 7d2b30597a89d73592f75cda1892801d65fbd5e2..e5ae946dba321628b322f8558f32f239356d1d80 100755 (executable)
--- a/ti/runtime/hplib/hplib_util.h
+++ b/ti/runtime/hplib/hplib_util.h
@@ -103,7 +103,7 @@ unsigned long t64_ticks_sec(void);
         unsigned long long timestamp (64 bits)
  */
 
-volatile static inline unsigned long long hplib_mUtilGetTimestamp(void) 
+static inline unsigned long long hplib_mUtilGetTimestamp(void)
 {
     volatile unsigned long long t1;
     volatile unsigned long long t2;
@@ -139,7 +139,7 @@ static inline long hplib_mUtilGetTicksPerSec(void)
  *  @retval
         unsigned long long timestamp (64 bits)
  */
-volatile static inline unsigned long long hplib_mUtilGetTimestamp(void)
+static inline unsigned long long hplib_mUtilGetTimestamp(void)
 {
     unsigned long vall;
     unsigned long valh;

diff --git a/ti/runtime/hplib/hplib_vm.h b/ti/runtime/hplib/hplib_vm.h
index 98c2a0909d5dae51389c03ded763df9e379ad83e..4cba89941707ff57027dd86819af35eefaf2e92b 100755 (executable)
--- a/ti/runtime/hplib/hplib_vm.h
+++ b/ti/runtime/hplib/hplib_vm.h
@@ -313,7 +313,7 @@ static inline void* hplib_mVMVirtToPhy (void *ptr)
  */
 static inline void * hplib_mVMPhyToVirtPoolId (void *ptr, uint8_t pool_id)
 {
-    if (pool_id > HPLIB_MAX_MEM_POOLS);
+    if (pool_id > (HPLIB_MAX_MEM_POOLS -1));
                 return (void *) hplib_OK;
     if (!ptr) return (void *) hplib_OK;
     if (((uint8_t *)ptr <memPoolAddr[pool_id].memStartPhy)||( (uint8_t *)ptr>memPoolAddr[pool_id].memEndPhy))
@@ -338,7 +338,7 @@ static inline void * hplib_mVMPhyToVirtPoolId (void *ptr, uint8_t pool_id)
 static inline void* hplib_mVMVirtToPhyPoolId(void *ptr, uint8_t pool_id)
 {
 
-    if (pool_id > HPLIB_MAX_MEM_POOLS);
+    if (pool_id > (HPLIB_MAX_MEM_POOLS -1))
                 return (void *) hplib_OK;
     if (!ptr) return (void *) hplib_OK;
     if (((uint8_t *)ptr <memPoolAddr[pool_id].memStart)||( (uint8_t *)ptr>memPoolAddr[pool_id].memEnd))

diff --git a/ti/runtime/hplib/module/hplibmod.c b/ti/runtime/hplib/module/hplibmod.c
index 93d9b020a0ef4599a201dbdee79193afda64f892..0a88279dc0343cbbedb50edd79ef066100560184 100755 (executable)
--- a/ti/runtime/hplib/module/hplibmod.c
+++ b/ti/runtime/hplib/module/hplibmod.c
@@ -56,6 +56,7 @@
 
 #define __E(fmt, args...) printk(KERN_ERR "HPLIBMOD Error: " fmt, ## args)
 
+#define LINE_LEN 50
 static struct class *hplibmod_class;
 static int hplibmod_major;
 
@@ -112,12 +113,12 @@ static ssize_t hplib_show(struct device *dev,
 {
     int len = 0;
 
-    len += sprintf(buf + len, "HPLIBMOD Info\n");
-    len += sprintf(buf + len, "======================\n");
-    len += sprintf(buf + len, "CMA memory properties :\n");
-    len += sprintf(buf + len, "Device viewed CMA physical address 0x%x\n", (unsigned int) dmaAddr);
-    len += sprintf(buf + len, "CPU    viewed CMA virtual  address 0x%x\n", (unsigned int) cpuAddr);
-    len += sprintf(buf + len, "Size   of CMA allocated            0x%x\n", memSize);
+    len += snprintf(buf + len, LINE_LEN, "HPLIBMOD Info\n");
+    len += snprintf(buf + len, LINE_LEN, "======================\n");
+    len += snprintf(buf + len, LINE_LEN, "CMA memory properties :\n");
+    len += snprintf(buf + len, LINE_LEN, "Device viewed CMA physical address 0x%x\n", (unsigned int) dmaAddr);
+    len += snprintf(buf + len, LINE_LEN, "CPU    viewed CMA virtual  address 0x%x\n", (unsigned int) cpuAddr);
+    len += snprintf(buf + len, LINE_LEN, "Size   of CMA allocated            0x%x\n", memSize);
 
     return len;
 
@@ -266,7 +267,7 @@ static int hplibmod_mmap(struct file *filp, struct vm_area_struct *vma)
                                 vma->vm_page_prot)) {
                 return -EAGAIN; 
             }
-            __D("mmap: page_prot=0x%x\n", vma->vm_page_prot);
+            __D("mmap: page_prot=%#lx\n", (long unsigned int) vma->vm_page_prot);
             return 0;
             break;
 
@@ -303,7 +304,6 @@ static struct device *hplib_dev;
 *********************************************************************************/
 static int __init hplibmod_init_module(void)
 {
-    void * priv = NULL; 
     int ret;
     
      __D("init\n");
@@ -341,6 +341,11 @@ static int __init hplibmod_init_module(void)
     hplib_dev = device_create(hplibmod_class, NULL, MKDEV(hplibmod_major, 0), NULL,
                   HPLIBMOD_DEVNAME);
 
+    if (IS_ERR(hplib_dev)) {
+        __E("Error creating hplib device .\n");
+        ret = PTR_ERR(hplib_dev);
+        goto cleanup_dev;
+    }
     device_create_file(hplib_dev,&dev_attr_hplib);
 
     __D("module loaded\n");

diff --git a/ti/runtime/hplib/src/hplib_vm.c b/ti/runtime/hplib/src/hplib_vm.c
index 9a07a28fc537fea872275465cef8d228a4e96a23..96003e0e9ac04f12165ed9b868888e9fd3cda6bd 100755 (executable)
--- a/ti/runtime/hplib/src/hplib_vm.c
+++ b/ti/runtime/hplib/src/hplib_vm.c
@@ -147,7 +147,7 @@ HPLIB_BOOL_T hplib_VM_MemAllocInit
 )
 {
     void *map_base = NULL;
-    uint32_t mapSize;
+    uint32_t mapSize = 0;
     uint32_t virtPoolHdrSize = sizeof(hplib_VirtMemPoolheader_T);
 
     /* Set up memory mapping for un-cached  memory, this requires physical  address and size of memory region to map*/
@@ -182,7 +182,7 @@ HPLIB_BOOL_T hplib_VM_MemAllocInit
                (uint32_t*)&memPoolAddr[i].memPoolHdr->bmap,
                HPLIB_VM_BM_ALLOC_PAGE_SIZE);
     }
-    if (addr == NULL)
+    else if (addr == NULL)
     {
         addr=  ( uint8_t *) hplib_utilGetPhysOfBufferArea();
         size = hplib_utilGetSizeOfBufferArea();
@@ -210,6 +210,10 @@ HPLIB_BOOL_T hplib_VM_MemAllocInit
                (uint32_t*)&memPoolAddr[i].memPoolHdr->bmap,
                HPLIB_VM_BM_ALLOC_PAGE_SIZE);
     }
+    else
+    {
+        return HPLIB_FALSE;
+    }
     if (i== 0)
     {
         hplib_VM_mem_size = size;
@@ -240,7 +244,7 @@ uint32_t  hplib_vmGetMemPoolRemainder(int pool_id)
     uint32_t virtPoolHdrSize;
     uint32_t mapSize;
 
-    if (pool_id > HPLIB_MAX_MEM_POOLS)
+    if (pool_id > (HPLIB_MAX_MEM_POOLS -1))
         return 0;
     Osal_hplibCsEnter();
 
@@ -272,7 +276,7 @@ void hplib_vmMemFree
     void* key = NULL;
     hplib_VirtMemPoolheader_T *poolHdr;
 
-    if ((pool_id > HPLIB_MAX_MEM_POOLS) || (ptr == NULL))
+    if ((pool_id > (HPLIB_MAX_MEM_POOLS -1)) || (ptr == NULL))
         return;
     Osal_hplibCsEnter();
 
@@ -299,7 +303,7 @@ void* hplib_vmMemAlloc
     hplib_VirtMemPoolheader_T *poolHdr;
     void *pMalloc = NULL;
 
-    if (pool_id > HPLIB_MAX_MEM_POOLS)
+    if (pool_id > (HPLIB_MAX_MEM_POOLS -1))
     {
         return NULL;
     }
@@ -330,7 +334,7 @@ void hplib_vmTeardown(void)
 hplib_RetValue hplib_checkMallocArea(int pool_id)
 {
     hplib_VirtMemPoolheader_T *poolHdr;
-    if (pool_id > HPLIB_MAX_MEM_POOLS)
+    if (pool_id > (HPLIB_MAX_MEM_POOLS-1))
     {
         return hplib_FAILURE;
     }
@@ -344,7 +348,7 @@ hplib_RetValue hplib_checkMallocArea(int pool_id)
 hplib_RetValue hplib_resetMallocArea(int pool_id)
 {
     hplib_VirtMemPoolheader_T *poolHdr;
-    if (pool_id > HPLIB_MAX_MEM_POOLS)
+    if (pool_id > (HPLIB_MAX_MEM_POOLS-1))
     {
         return hplib_FAILURE;
     }
@@ -363,7 +367,7 @@ hplib_RetValue hplib_initMallocArea(int pool_id)
 {
     hplib_VirtMemPoolheader_T *poolHdr;
 
-    if (pool_id > HPLIB_MAX_MEM_POOLS)
+    if (pool_id > (HPLIB_MAX_MEM_POOLS -1))
     {
         return hplib_FAILURE;
     }