From 35f9cb006534018b6f69dce8f0d22684fe98e812 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 6 May 2021 12:07:02 +0200 Subject: [PATCH] net/ice/base: fix memory allocation wrapper This is reported by our internal covscan: 1. dpdk-20.11/drivers/net/ice/base/ice_switch.c:4214: sign_extension: Suspicious implicit sign extension: "s_rule_size" with type "u16" (16 bits, unsigned) is promoted in "num_unicast * s_rule_size" to type "int" (32 bits, signed), then sign-extended to type "unsigned long" (64 bits, unsigned). If "num_unicast * s_rule_size" is greater than 0x7FFFFFFF, the upper bits of the result will all be 1. # 4212| s_rule_size = ICE_SW_RULE_RX_TX_ETH_HDR_SIZE; # 4213| s_rule = (struct ice_aqc_sw_rules_elem *) # 4214|-> ice_calloc(hw, num_unicast, s_rule_size); # 4215| if (!s_rule) { # 4216| status = ICE_ERR_NO_MEMORY; Even if this condition is not likely to happen, in any case, it is more straightforward to rely on the existing rte_calloc. Fixes: 5f0978e96220 ("net/ice/base: add OS specific implementation") Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/ice/base/ice_osdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_osdep.h b/drivers/net/ice/base/ice_osdep.h index f4cc762e99..878c5597d4 100644 --- a/drivers/net/ice/base/ice_osdep.h +++ b/drivers/net/ice/base/ice_osdep.h @@ -207,7 +207,7 @@ struct ice_virt_mem { } __rte_packed; #define ice_malloc(h, s) rte_zmalloc(NULL, s, 0) -#define ice_calloc(h, c, s) rte_zmalloc(NULL, (c) * (s), 0) +#define ice_calloc(h, c, s) rte_calloc(NULL, c, s, 0) #define ice_free(h, m) rte_free(m) #define ice_memset(a, b, c, d) memset((a), (b), (c)) -- 2.20.1