This patch fixes buffer overflow reported by ASAN,
please reference https://bugs.dpdk.org/show_bug.cgi?id=818
Some tests for the rte_hash table use the rte_jhash_32b() as
the hash function. This hash function interprets the length
argument in units of 4 bytes.
This patch divides configured key length by 4 in cases when
rte_jhash_32b() is used.
For some tests rte_jhash() is used with keys of length not
a multiple of 4 bytes. From the rte_jhash() documentation:
If input key is not aligned to four byte boundaries or a
multiple of four bytes in length, the memory region just
after may be read (but not used in the computation).
This patch increases the size of the proto field of the
flow_key struct up to uint32_t and sets the alignment to 4 bytes.
Bugzilla ID: 818
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org
Signed-off-by: Vladimir Medvedkin <vladimir.medved...@intel.com>
---
app/test/test_hash.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index bd4d0cb..e3f2d29 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -80,8 +80,8 @@ struct flow_key {
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
- uint8_t proto;
-} __rte_packed;
+ uint32_t proto;
+} __rte_packed __rte_aligned(sizeof(uint32_t));
/*
* Hash function that always returns the same value, to easily test what
@@ -1617,7 +1617,8 @@ test_hash_add_delete_jhash2(void)
int32_t pos1, pos2;
hash_params_ex.name = "hash_test_jhash2";
- hash_params_ex.key_len = 4;
+ /* Set the key_len divided by 4 due to using rte_jhash_32b() */
+ hash_params_ex.key_len = 4 / sizeof(uint32_t);
hash_params_ex.hash_func = (rte_hash_function)rte_jhash_32b;
handle = rte_hash_create(&hash_params_ex);
@@ -1656,7 +1657,8 @@ test_hash_add_delete_2_jhash2(void)
int32_t pos1, pos2;
hash_params_ex.name = "hash_test_2_jhash2";
- hash_params_ex.key_len = 8;
+ /* Set the key_len divided by 4 due to using rte_jhash_32b() */
+ hash_params_ex.key_len = 8 / sizeof(uint32_t);
hash_params_ex.hash_func = (rte_hash_function)rte_jhash_32b;
handle = rte_hash_create(&hash_params_ex);
--
2.7.4
