Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
pmalloc: correct format_pmalloc_map u32 index overrun bug
[vpp.git]
/
src
/
vppinfra
/
pmalloc.c
diff --git
a/src/vppinfra/pmalloc.c
b/src/vppinfra/pmalloc.c
index
62b4f60
..
e903511
100644
(file)
--- a/
src/vppinfra/pmalloc.c
+++ b/
src/vppinfra/pmalloc.c
@@
-212,7
+212,7
@@
pmalloc_update_lookup_table (clib_pmalloc_main_t * pm, u32 first, u32 count)
vec_validate_aligned (pm->lookup_table, vec_len (pm->pages) *
elts_per_page - 1, CLIB_CACHE_LINE_BYTES);
vec_validate_aligned (pm->lookup_table, vec_len (pm->pages) *
elts_per_page - 1, CLIB_CACHE_LINE_BYTES);
- p =
first *
elts_per_page;
+ p =
(uword) first *
elts_per_page;
if (pm->flags & CLIB_PMALLOC_F_NO_PAGEMAP)
{
while (p < (uword) elts_per_page * count)
if (pm->flags & CLIB_PMALLOC_F_NO_PAGEMAP)
{
while (p < (uword) elts_per_page * count)
@@
-428,7
+428,7
@@
clib_pmalloc_create_shared_arena (clib_pmalloc_main_t * pm, char *name,
return 0;
}
return 0;
}
- return pm->base + (pp->index << pm->def_log2_page_sz);
+ return pm->base + (
(uword)
pp->index << pm->def_log2_page_sz);
}
static inline void *
}
static inline void *
@@
-607,8
+607,6
@@
format_pmalloc_page (u8 * s, va_list * va)
int verbose = va_arg (*va, int);
u32 indent = format_get_indent (s);
int verbose = va_arg (*va, int);
u32 indent = format_get_indent (s);
- s = format (s, "page %u: phys-addr %p ", pp->index, pp->pa);
-
if (pp->chunks == 0)
return s;
if (pp->chunks == 0)
return s;
@@
-698,7
+696,9
@@
format_pmalloc_map (u8 * s, va_list * va)
{
uword *lookup_val, pa, va;
lookup_val = vec_elt_at_index (pm->lookup_table, index);
{
uword *lookup_val, pa, va;
lookup_val = vec_elt_at_index (pm->lookup_table, index);
- va = pointer_to_uword (pm->base) + (index << pm->lookup_log2_page_sz);
+ va =
+ pointer_to_uword (pm->base) +
+ ((uword) index << pm->lookup_log2_page_sz);
pa = va - *lookup_val;
s =
format (s, "\n %16p %13p %8U", uword_to_pointer (va, u64),
pa = va - *lookup_val;
s =
format (s, "\n %16p %13p %8U", uword_to_pointer (va, u64),