From f2088e785cca5d0d6471aaebe90c0f8dabc5d069 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 8 Apr 2019 10:46:40 +0100 Subject: [PATCH] net/i40e: fix dereference before check when getting EEPROM As flagged by coverity, the "info" structure is being explicitly dereferenced before being checked later for a NULL value. Coverity issue: 277241 Fixes: 98e60c0d43f1 ("net/i40e: add module EEPROM callbacks for i40e") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Rami Rosen --- drivers/net/i40e/i40e_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index f6fc0056c4..301193492a 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -11900,16 +11900,17 @@ static int i40e_get_module_eeprom(struct rte_eth_dev *dev, struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); bool is_sfp = false; i40e_status status; - uint8_t *data = info->data; + uint8_t *data; uint32_t value = 0; uint32_t i; - if (!info || !info->length || !data) + if (!info || !info->length || !info->data) return -EINVAL; if (hw->phy.link_info.module_type[0] == I40E_MODULE_TYPE_SFP) is_sfp = true; + data = info->data; for (i = 0; i < info->length; i++) { u32 offset = i + info->offset; u32 addr = is_sfp ? I40E_I2C_EEPROM_DEV_ADDR : 0; -- 2.20.1