From 27c35e30569c3904e977e7f841b8bc56f16aeb9f Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 7 Oct 2020 09:37:36 -0400 Subject: vppinfra: fix coverity warnings Type: fix Signed-off-by: Dave Barach Change-Id: I654747d618cc4fe99b7774827303769fe43392ed --- src/vppinfra/linux/mem.c | 8 ++++---- src/vppinfra/mem.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c index 22268eadb8e..f31b456308d 100644 --- a/src/vppinfra/linux/mem.c +++ b/src/vppinfra/linux/mem.c @@ -374,7 +374,7 @@ clib_mem_vm_map_hdr_t * 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_vm_map_internal (void *base, clib_mem_page_sz_t log2_page_sz, { 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 @@ clib_mem_vm_map_internal (void *base, clib_mem_page_sz_t log2_page_sz, 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 @@ int 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) diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h index a94b66ae187..ca8161abae5 100644 --- a/src/vppinfra/mem.h +++ b/src/vppinfra/mem.h @@ -543,7 +543,7 @@ clib_mem_log2_page_size_validate (clib_mem_page_sz_t log2_page_size) 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 * -- cgit 1.2.3-korg