Skip to content

Commit 954ba97

Browse files
anguy11kuba-moo
authored andcommitted
e1000e: Remove unneeded checks
The caller, ethtool_set_eeprom(), already performs the same checks so these are unnecessary in the driver. This reverts commit 90fb7db ("e1000e: fix heap overflow in e1000_set_eeprom"), however, corrections for RCT have been kept. Link: https://lore.kernel.org/all/db92fcc8-114d-4e85-9d15-7860545bc65e@suse.de/ Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Link: https://patch.msgid.link/20251125223632.1857532-7-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 8dd72eb commit 954ba97

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

drivers/net/ethernet/intel/e1000e/ethtool.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,9 @@ static int e1000_set_eeprom(struct net_device *netdev,
551551
{
552552
struct e1000_adapter *adapter = netdev_priv(netdev);
553553
struct e1000_hw *hw = &adapter->hw;
554-
size_t total_len, max_len;
555554
u16 *eeprom_buff;
556555
int ret_val = 0;
556+
size_t max_len;
557557
int first_word;
558558
int last_word;
559559
void *ptr;
@@ -571,10 +571,6 @@ static int e1000_set_eeprom(struct net_device *netdev,
571571

572572
max_len = hw->nvm.word_size * 2;
573573

574-
if (check_add_overflow(eeprom->offset, eeprom->len, &total_len) ||
575-
total_len > max_len)
576-
return -EFBIG;
577-
578574
first_word = eeprom->offset >> 1;
579575
last_word = (eeprom->offset + eeprom->len - 1) >> 1;
580576
eeprom_buff = kmalloc(max_len, GFP_KERNEL);

0 commit comments

Comments
 (0)