summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-09-03 13:10:55 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-03 20:02:04 -0700
commitcf503e8f458cec455b18d3938b3b27de6db3105e (patch)
tree1a74f7741be82cd6ded3371ee794f80f749e1a86
parent270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1 (diff)
downloadlinux-3.10-cf503e8f458cec455b18d3938b3b27de6db3105e.tar.gz
linux-3.10-cf503e8f458cec455b18d3938b3b27de6db3105e.tar.bz2
linux-3.10-cf503e8f458cec455b18d3938b3b27de6db3105e.zip
netxen: fix infinite loop on dma mapping failure
Fix a perpetual while() loop in unwinding partial mapped tx skb on dma mapping failure. Reported-by: "Juha Leppanen" <juha_motorsportcom@luukku.com> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 53d57dc4d64..41b29671fc9 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1577,8 +1577,8 @@ netxen_map_tx_skb(struct pci_dev *pdev,
return 0;
unwind:
- while (i > 0) {
- nf = &pbuf->frag_array[i];
+ while (--i >= 0) {
+ nf = &pbuf->frag_array[i+1];
pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE);
}