Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: fix vec_prepend use-after-free
[vpp.git]
/
src
/
vppinfra
/
bihash_48_8.h
diff --git
a/src/vppinfra/bihash_48_8.h
b/src/vppinfra/bihash_48_8.h
index
54fd709
..
dbc92c3
100644
(file)
--- a/
src/vppinfra/bihash_48_8.h
+++ b/
src/vppinfra/bihash_48_8.h
@@
-42,11
+42,16
@@
typedef struct
u64 value;
} clib_bihash_kv_48_8_t;
u64 value;
} clib_bihash_kv_48_8_t;
+static inline void
+clib_bihash_mark_free_48_8 (clib_bihash_kv_48_8_t *v)
+{
+ v->value = 0xFEEDFACE8BADF00DULL;
+}
+
static inline int
clib_bihash_is_free_48_8 (const clib_bihash_kv_48_8_t * v)
{
static inline int
clib_bihash_is_free_48_8 (const clib_bihash_kv_48_8_t * v)
{
- /* Free values are clib_memset to 0xff, check a bit... */
- if (v->key[0] == ~0ULL && v->value == ~0ULL)
+ if (v->value == 0xFEEDFACE8BADF00DULL)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-78,8
+83,8
@@
static inline int
clib_bihash_key_compare_48_8 (u64 * a, u64 * b)
{
#if defined (CLIB_HAVE_VEC512)
clib_bihash_key_compare_48_8 (u64 * a, u64 * b)
{
#if defined (CLIB_HAVE_VEC512)
- u64x8 v = u64x8_load_unaligned (a) ^ u64x8_load_unaligned (b);
-
return (u64x8_is_zero_mask (v) & 0x3f) == 0
;
+ return u64x8_is_equal (u64x8_mask_load_zero (a, 0x3f),
+
u64x8_mask_load_zero (b, 0x3f))
;
#elif defined (CLIB_HAVE_VEC256)
u64x4 v = { 0 };
v = u64x4_insert_lo (v, u64x2_load_unaligned (a + 4) ^
#elif defined (CLIB_HAVE_VEC256)
u64x4 v = { 0 };
v = u64x4_insert_lo (v, u64x2_load_unaligned (a + 4) ^