diff mbox series

net/ixgbe: fix offset value check

Message ID 1565160199-16087-1-git-send-email-zhang.congwen@zte.com.cn (mailing list archive)
State Superseded, archived
Headers
Series net/ixgbe: fix offset value check |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK

Commit Message

Congwen Zhang Aug. 7, 2019, 6:43 a.m. UTC 
  The "and" condition offset == 0 && offset == NVM_INVALID_PTR
 can never be true.

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

Comments

Xiaolong Ye Aug. 7, 2019, 8:33 a.m. UTC | #1 
Hi,

On 08/07, Congwen Zhang wrote:
>The "and" condition offset == 0 && offset == NVM_INVALID_PTR
> can never be true.

A fix tag is missing here, you can refer to other fix commits in git log history.
and also cc stable@dpdk.org.

>
>Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
>---
> 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
>

For the patch, you can add my ack in next version. 

Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
diff mbox series

Patch

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 */