diff mbox series

[v3] net/ixgbe: fix offset value check

Message ID 1565224640-24239-1-git-send-email-zhang.congwen@zte.com.cn (mailing list archive)
State Accepted, archived
Headers
Series [v3] net/ixgbe: fix offset value check |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-Compile-Testing success Compile Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Congwen Zhang Aug. 8, 2019, 12:37 a.m. UTC 
  The "and" condition offset == 0 && offset == NVM_INVALID_PTR
 can never be true.

Fixes: cf3af5aa56c9 ("net/ixgbe/base: add functions to get version info")
Cc: stable@dpdk.org

Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Monjalon Aug. 8, 2019, 11:30 a.m. UTC | #1 
08/08/2019 02:37, Congwen Zhang:
> The "and" condition offset == 0 && offset == NVM_INVALID_PTR
>  can never be true.
> 
> Fixes: cf3af5aa56c9 ("net/ixgbe/base: add functions to get version info")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
> Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>

Applied, thanks

Note: it looks simple enough to be merged in 19.08 post rc4.
diff mbox series

Patch

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index fb50719..62ff767 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -5040,7 +5040,7 @@  void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,
 	hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);
 
 	/* Return is offset to OEM Product Version block is invalid */
-	if (offset == 0x0 && offset == NVM_INVALID_PTR)
+	if (offset == 0x0 || offset == NVM_INVALID_PTR)
 		return;
 
 	/* Read product version block */