From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A41BFA00E6 for ; Wed, 7 Aug 2019 11:28:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 979F82C18; Wed, 7 Aug 2019 11:28:49 +0200 (CEST) Received: from mxct.zte.com.cn (mx7.zte.com.cn [202.103.147.169]) by dpdk.org (Postfix) with ESMTP id 3E1BC2C18; Wed, 7 Aug 2019 11:28:47 +0200 (CEST) Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id 24A08684BCA2C509DC25; Wed, 7 Aug 2019 17:28:46 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id x779RtXr012630; Wed, 7 Aug 2019 17:27:55 +0800 (GMT-8) (envelope-from zhang.congwen@zte.com.cn) Received: from 99-99-1-100.lightspeed.wepbfl.sbcglobal.net ([10.43.166.165]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2019080717281562-2799644 ; Wed, 7 Aug 2019 17:28:15 +0800 From: Congwen Zhang To: wenzhuo.lu@intel.com Cc: dev@dpdk.org, stable@dpdk.org, Congwen Zhang Date: Wed, 7 Aug 2019 16:49:08 +0800 Message-Id: <1565167748-7378-1-git-send-email-zhang.congwen@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2019-08-07 17:28:15, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-08-07 17:27:58, Serialize complete at 2019-08-07 17:27:58 X-MAIL: mse-fl1.zte.com.cn x779RtXr012630 Subject: [dpdk-stable] [PATCH v2] net/ixgbe: fix offset value check X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The "and" condition offset == 0 && offset == NVM_INVALID_PTR can never be true. Fixes: cf3af5aa56c9 ("net/ixgbe/base: add functions to get version info") Signed-off-by: Congwen Zhang Acked-by: Xiaolong Ye --- drivers/net/ixgbe/base/ixgbe_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index fb50719..e2ffbe6 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 */ -- 1.8.3.1