From: Yerden Zhumabekov <e_zhumabekov@sts.kz>
Date: Tue, 24 Mar 2015 13:31:55 +0000 (+0600)
Subject: hash: fix strict-aliasing for CRC
X-Git-Tag: spdx-start~9387
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=504a29af13a7b87064f9fe0c5cc020b8a739efd3;p=dpdk.git

hash: fix strict-aliasing for CRC

Fix rte_hash_crc() function by making use of uintptr_t variable
to hold a pointer to data being hashed. In this way, casting uint64_t
pointer to uint32_t avoided.

Fixes: 614289298daf ("hash: slice CRC data into 8-byte pieces")

Signed-off-by: Yerden Zhumabekov <e_zhumabekov@sts.kz>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---

diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
index 1cd626cb4a..abdbd9ad42 100644
--- a/lib/librte_hash/rte_hash_crc.h
+++ b/lib/librte_hash/rte_hash_crc.h
@@ -513,35 +513,36 @@ rte_hash_crc(const void *data, uint32_t data_len, uint32_t init_val)
 {
 	unsigned i;
 	uint64_t temp = 0;
-	const uint64_t *p64 = (const uint64_t *)data;
+	uintptr_t pd = (uintptr_t) data;
 
 	for (i = 0; i < data_len / 8; i++) {
-		init_val = rte_hash_crc_8byte(*p64++, init_val);
+		init_val = rte_hash_crc_8byte(*(const uint64_t *)pd, init_val);
+		pd += 8;
 	}
 
 	switch (7 - (data_len & 0x07)) {
 	case 0:
-		temp |= (uint64_t) *((const uint8_t *)p64 + 6) << 48;
+		temp |= (uint64_t) *((const uint8_t *)pd + 6) << 48;
 		/* Fallthrough */
 	case 1:
-		temp |= (uint64_t) *((const uint8_t *)p64 + 5) << 40;
+		temp |= (uint64_t) *((const uint8_t *)pd + 5) << 40;
 		/* Fallthrough */
 	case 2:
-		temp |= (uint64_t) *((const uint8_t *)p64 + 4) << 32;
-		temp |= *((const uint32_t *)p64);
+		temp |= (uint64_t) *((const uint8_t *)pd + 4) << 32;
+		temp |= *(const uint32_t *)pd;
 		init_val = rte_hash_crc_8byte(temp, init_val);
 		break;
 	case 3:
-		init_val = rte_hash_crc_4byte(*(const uint32_t *)p64, init_val);
+		init_val = rte_hash_crc_4byte(*(const uint32_t *)pd, init_val);
 		break;
 	case 4:
-		temp |= *((const uint8_t *)p64 + 2) << 16;
+		temp |= *((const uint8_t *)pd + 2) << 16;
 		/* Fallthrough */
 	case 5:
-		temp |= *((const uint8_t *)p64 + 1) << 8;
+		temp |= *((const uint8_t *)pd + 1) << 8;
 		/* Fallthrough */
 	case 6:
-		temp |= *((const uint8_t *)p64);
+		temp |= *(const uint8_t *)pd;
 		init_val = rte_hash_crc_4byte(temp, init_val);
 		/* Fallthrough */
 	default: