commit 27c35e30569c3904e977e7f841b8bc56f16aeb9f
author Dave Barach <dave@barachs.net> Wed Oct 07 09:37:36 2020 -0400
committer Damjan Marion <dmarion@me.com> Thu Oct 08 06:10:16 2020 +0000
tree 4f37824acc98769d14f6a4c6e6c613deed5b5f0e
parent 6e366be38ff4f71d4ad5a24929519dc3c874ed36

vppinfra: fix coverity warnings

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I654747d618cc4fe99b7774827303769fe43392ed

src/vppinfra/linux/mem.c

diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c
index 22268ea..f31b456 100644
--- a/src/vppinfra/linux/mem.c
+++ b/src/vppinfra/linux/mem.c
@@ -374,7 +374,7 @@
 clib_mem_vm_get_next_map_hdr (clib_mem_vm_map_hdr_t * hdr)
 {
   clib_mem_main_t *mm = &clib_mem_main;
-  uword sys_page_sz = 1 << mm->log2_page_sz;
+  uword sys_page_sz = 1ULL << mm->log2_page_sz;
   clib_mem_vm_map_hdr_t *next;
   if (hdr == 0)
     {
@@ -396,7 +396,7 @@
 {
   clib_mem_main_t *mm = &clib_mem_main;
   clib_mem_vm_map_hdr_t *hdr;
-  uword sys_page_sz = 1 << mm->log2_page_sz;
+  uword sys_page_sz = 1ULL << mm->log2_page_sz;
   int mmap_flags = MAP_FIXED, is_huge = 0;
 
   if (fd != -1)
@@ -436,7 +436,7 @@
   if (log2_page_sz == CLIB_MEM_PAGE_SZ_UNKNOWN)
     return CLIB_MEM_VM_MAP_FAILED;
 
-  size = round_pow2 (size, 1 << log2_page_sz);
+  size = round_pow2 (size, 1ULL << log2_page_sz);
 
   base = (void *) clib_mem_vm_reserve ((uword) base, size, log2_page_sz);
 
@@ -492,7 +492,7 @@
 clib_mem_vm_unmap (void *base)
 {
   clib_mem_main_t *mm = &clib_mem_main;
-  uword size, sys_page_sz = 1 << mm->log2_page_sz;
+  uword size, sys_page_sz = 1ULL << mm->log2_page_sz;
   clib_mem_vm_map_hdr_t *hdr = base - sys_page_sz;;
 
   if (mprotect (hdr, sys_page_sz, PROT_READ | PROT_WRITE) != 0)

src/vppinfra/mem.h

diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h
index a94b66a..ca8161a 100644
--- a/src/vppinfra/mem.h
+++ b/src/vppinfra/mem.h
@@ -543,7 +543,7 @@
 static_always_inline uword
 clib_mem_page_bytes (clib_mem_page_sz_t log2_page_size)
 {
-  return 1 << clib_mem_log2_page_size_validate (log2_page_size);
+  return 1ULL << clib_mem_log2_page_size_validate (log2_page_size);
 }
 
 static_always_inline clib_error_t *