Skip to content

Commit ee400a3

Browse files
likebreathJeff Kirsher
authored andcommitted
e1000: ensure to free old tx/rx rings in set_ringparam()
In 'e1000_set_ringparam()', the tx_ring and rx_ring are updated with new value and the old tx/rx rings are freed only when the device is up. There are resource leaks on old tx/rx rings when the device is not up. This bug is reported by COD, a tool for testing kernel module binaries I am building. This patch fixes the bug by always calling 'kfree()' on old tx/rx rings in 'e1000_set_ringparam()'. Signed-off-by: Bo Chen <chenbo@pdx.edu> Reviewed-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
1 parent cf1acec commit ee400a3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,14 +624,14 @@ static int e1000_set_ringparam(struct net_device *netdev,
624624
adapter->tx_ring = tx_old;
625625
e1000_free_all_rx_resources(adapter);
626626
e1000_free_all_tx_resources(adapter);
627-
kfree(tx_old);
628-
kfree(rx_old);
629627
adapter->rx_ring = rxdr;
630628
adapter->tx_ring = txdr;
631629
err = e1000_up(adapter);
632630
if (err)
633631
goto err_setup;
634632
}
633+
kfree(tx_old);
634+
kfree(rx_old);
635635

636636
clear_bit(__E1000_RESETTING, &adapter->flags);
637637
return 0;

0 commit comments

Comments
 (0)