2022-11-05 08:28:29

by Yue Haibing

Subject: [PATCH net-next 0/2] net: txgbe: Fix two bugs in txgbe_calc_eeprom_checksum

Fix memleak and unsigned comparison bugs in txgbe_calc_eeprom_checksum

YueHaibing (2):
net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()
net: txgbe: Fix unsigned comparison to zero in
txgbe_calc_eeprom_checksum()

drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

--
2.17.1

2022-11-05 08:30:01

by Yue Haibing

Subject: [PATCH net-next 2/2] net: txgbe: Fix unsigned comparison to zero in txgbe_calc_eeprom_checksum()

The error checks on checksum for a negative error return always fails because
it is unsigned and can never be negative.

Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
index 9cf5fe33118e..167f7ff73192 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
@@ -200,10 +200,11 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum)
if (eeprom_ptrs)
kvfree(eeprom_ptrs);

- *checksum = TXGBE_EEPROM_SUM - *checksum;
- if (*checksum < 0)
+ if (*checksum > TXGBE_EEPROM_SUM)
return -EINVAL;

+ *checksum = TXGBE_EEPROM_SUM - *checksum;
+
return 0;
}

--
2.17.1

2022-11-05 08:51:08

by Yue Haibing

Subject: [PATCH net-next 1/2] net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()

eeprom_ptrs should be freed before returned.

Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
index 0b1032195859..9cf5fe33118e 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
@@ -183,6 +183,7 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum)
eeprom_ptrs);
if (status != 0) {
wx_err(wxhw, "Failed to read EEPROM image\n");
+ kvfree(eeprom_ptrs);
return status;
}
local_buffer = eeprom_ptrs;
@@ -196,13 +197,13 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum)
if (i != wxhw->eeprom.sw_region_offset + TXGBE_EEPROM_CHECKSUM)
*checksum += local_buffer[i];

+ if (eeprom_ptrs)
+ kvfree(eeprom_ptrs);
+
*checksum = TXGBE_EEPROM_SUM - *checksum;
if (*checksum < 0)
return -EINVAL;

- if (eeprom_ptrs)
- kvfree(eeprom_ptrs);
-
return 0;
}

--
2.17.1

2022-11-08 04:39:26

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next 0/2] net: txgbe: Fix two bugs in txgbe_calc_eeprom_checksum

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:

On Sat, 5 Nov 2022 16:07:20 +0800 you wrote:
> Fix memleak and unsigned comparison bugs in txgbe_calc_eeprom_checksum
>
> YueHaibing (2):
> net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()
> net: txgbe: Fix unsigned comparison to zero in
> txgbe_calc_eeprom_checksum()
>
> [...]

Here is the summary with links:
- [net-next,1/2] net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()
https://git.kernel.org/netdev/net-next/c/a068d33e542f
- [net-next,2/2] net: txgbe: Fix unsigned comparison to zero in txgbe_calc_eeprom_checksum()
https://git.kernel.org/netdev/net-next/c/5e2ea7801fac

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

2023-07-11 03:07:39

by Jiawen Wu

Subject: RE: [PATCH net-next 2/2] net: txgbe: Fix unsigned comparison to zero in txgbe_calc_eeprom_checksum()

On Saturday, November 5, 2022 4:07 PM, YueHaibing wrote:
> The error checks on checksum for a negative error return always fails because
> it is unsigned and can never be negative.
>
> Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
> index 9cf5fe33118e..167f7ff73192 100644
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
> @@ -200,10 +200,11 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum)
> if (eeprom_ptrs)
> kvfree(eeprom_ptrs);
>
> - *checksum = TXGBE_EEPROM_SUM - *checksum;
> - if (*checksum < 0)
> + if (*checksum > TXGBE_EEPROM_SUM)
> return -EINVAL;
>
> + *checksum = TXGBE_EEPROM_SUM - *checksum;
> +
> return 0;
> }

It is a pity, I didn't review this patch carefully. *checksum will sometimes
be larger than TXGBE_EEPROM_SUM. It's correct to remove these two lines:

- if (*checksum < 0)
- return -EINVAL;

I'll send a patch to fix it.