]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
e1000/e1000e: Fix leak in DMA error cleanup
authorMatt Vollrath <tactii@gmail.com>
Tue, 24 Feb 2026 23:28:33 +0000 (18:28 -0500)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 10 Mar 2026 20:02:54 +0000 (13:02 -0700)
commite94eaef11142b01f77bf8ba4d0b59720b7858109
treefacc2b6a7fd72c512ae0dcfb30444a05ade8ac8e
parente809085f492842ce7a519c9ef72d40f4bca89c13
e1000/e1000e: Fix leak in DMA error cleanup

If an error is encountered while mapping TX buffers, the driver should
unmap any buffers already mapped for that skb.

Because count is incremented after a successful mapping, it will always
match the correct number of unmappings needed when dma_error is reached.
Decrementing count before the while loop in dma_error causes an
off-by-one error. If any mapping was successful before an unsuccessful
mapping, exactly one DMA mapping would leak.

In these commits, a faulty while condition caused an infinite loop in
dma_error:
Commit 03b1320dfcee ("e1000e: remove use of skb_dma_map from e1000e
driver")
Commit 602c0554d7b0 ("e1000: remove use of skb_dma_map from e1000 driver")

Commit c1fa347f20f1 ("e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of
unsigned in *_tx_map()") fixed the infinite loop, but introduced the
off-by-one error.

This issue may still exist in the igbvf driver, but I did not address it
in this patch.

Fixes: c1fa347f20f1 ("e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()")
Assisted-by: Claude:claude-4.6-opus
Signed-off-by: Matt Vollrath <tactii@gmail.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/e1000e/netdev.c