ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

physmem: coverity issues

Browse Source 
Change-Id: I34cc55d8292a69fb451ed0031484994f51d3537a
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2018-10-26 10:29:35 +02:00
committed by Damjan Marion
parent 5665cedf57
commit 878b65aa6c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/ixge/ixge.c
View File

@ -2843,9 +2843,6 @@ ixge_pci_init (vlib_main_t * vm, vlib_pci_dev_handle_t h)
vlib_pci_addr_t *addr = vlib_pci_get_addr (vm, h);
vlib_pci_device_info_t *d = vlib_pci_get_device_info (vm, addr, 0);
if (error)
return error;
error = vlib_pci_map_region (vm, h, 0, &r);
if (error)
return error;

7
src/vppinfra/pmalloc.c
View File

@ -101,7 +101,7 @@ clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size)
pm->base += off;
}
munmap (pm->base + (pm->max_pages * pagesize), pagesize - off);
munmap (pm->base + ((uword) pm->max_pages * pagesize), pagesize - off);
return 0;
}
@ -215,7 +215,7 @@ pmalloc_update_lookup_table (clib_pmalloc_main_t * pm, u32 first, u32 count)
p = first * elts_per_page;
if (pm->flags & CLIB_PMALLOC_F_NO_PAGEMAP)
{
while (p < elts_per_page * count)
while (p < (uword) elts_per_page * count)
{
pm->lookup_table[p] = pointer_to_uword (pm->base) +
(p << pm->lookup_log2_page_sz);
@ -225,9 +225,10 @@ pmalloc_update_lookup_table (clib_pmalloc_main_t * pm, u32 first, u32 count)
}
fd = open ((char *) "/proc/self/pagemap", O_RDONLY);
while (p < elts_per_page * count)
while (p < (uword) elts_per_page * count)
{
va = pointer_to_uword (pm->base) + (p << pm->lookup_log2_page_sz);
pa = 0;
seek = (va >> pm->sys_log2_page_sz) * sizeof (pa);
if (fd != -1 && lseek (fd, seek, SEEK_SET) == seek &&
read (fd, &pa, sizeof (pa)) == (sizeof (pa)) &&