ethernet: et131x: Add missing check after DMA map
Subsystems (3)
PATCH 1/1 ethernet: et131x: Add missing check after DMA map
The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error.
--- drivers/net/ethernet/agere/et131x.c | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/net/ethernet/agere/et131x.c +37 -0
@@ -2459,6 +2459,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) skb->data,skb_headlen (skb), DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) +return -ENOMEM ; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2468,6 +2472,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) skb->data,skb_headlen (skb) /2 , DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) +return -ENOMEM ; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2478,6 +2486,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)skb_headlen (skb) /2 ,skb_headlen (skb) /2 , DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) + goto unmap_first_out; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2489,6 +2501,9 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)0 , desc[frag].len_vlan, DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, dma_addr)) + goto unmap_out; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2578,6 +2593,28 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) &adapter->regs->global.watchdog_timer); }return 0 ; + +unmap_out: +// Unmap everything from i-1 to 1 +while (--i) { + frag--; + dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_page (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +unmap_first_out: +// unmap header +while (frag--) { + frag--; + dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_single (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +return -ENOMEM ; }static int send_packet (struct sk_buff *skb,struct et131x_adapter *adapter)
Signature · 1 line
2.43.0
Simon Horman
reviewerQuoted 5 lines · Thomas Fourier
The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error.
Fixes 38df6492eb51 ("et131x: Add PCIe gigabit ethernet driver et131x to drivers/net")Signed-off-by Thomas Fourier <[email protected]>
nits:
1) There are two spaces after "et131x:" in the subject. One is enough.
2) I think you can drop "ethernet: " from the subject. "et131x: " seems to be an appropriate prefix based on git history.
...
Quoted 4 lines
drivers/net/ethernet/agere/et131x.c +0
-0@@ -2578,6 +2593,28 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) &adapter->regs->global.watchdog_timer); }return 0 ;
drivers/net/ethernet/agere/et131x.c static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) · line 2605
Quoted 10 lines
drivers/net/ethernet/agere/et131x.c +10
-0+ +unmap_out: +// Unmap everything from i-1 to 1 +while (--i) { + frag--; + dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_page (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + }
I'm probably missing something obvious. But it seems to me that frag is incremented iff a mapping is successful. So I think only the loop below is needed.
drivers/net/ethernet/agere/et131x.c static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) · line 2610
Quoted 5 lines
drivers/net/ethernet/agere/et131x.c +5
-0+ +unmap_first_out: +// unmap header +while (frag--) { + frag--;
I don't think you want to decrement frag twice here.
Quoted 10 lines
drivers/net/ethernet/agere/et131x.c +7
-0+ dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_single (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +return -ENOMEM ; }static int send_packet (struct sk_buff *skb,struct et131x_adapter *adapter)
Signature · 1 line
pw-bot: changes-requested
Quoted 8 lines · Simon Horman
Quoted 5 lines · Thomas Fourier
The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error.
Fixes 38df6492eb51 ("et131x: Add PCIe gigabit ethernet driver et131x to drivers/net")Signed-off-by Thomas Fourier <[email protected]>nits:
Quoted 7 lines
1) There are two spaces after "et131x:" in the subject. One is enough.
2) I think you can drop "ethernet: " from the subject. "et131x: " seems to be an appropriate prefix based on git history.
...
Ok, I'll make sure to fix that.
Quoted 10 lines
Quoted 10 lines
drivers/net/ethernet/agere/et131x.c +5
-0@@ -2578,6 +2593,28 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) &adapter->regs->global.watchdog_timer); }return 0 ; + +unmap_out: +// Unmap everything from i-1 to 1 +while (--i) { + frag--;
Quoted 8 lines
drivers/net/ethernet/agere/et131x.c static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) · line 2605
Quoted 5 lines
drivers/net/ethernet/agere/et131x.c +5
-0+ dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_page (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + }I'm probably missing something obvious. But it seems to me that frag is incremented iff a mapping is successful. So I think only the loop below is needed.
Yes, frag is incremented only after a successful mapping.
The first loop is to unmap the body of the packet (i >= 1) which is mapped
with skb_frag_dma_map() (and unmapped with dma_unmap_page). The
second is to unmap the header which is either one or two mappings of
map_single. Should I make the comments more explicit?
Quoted 18 lines
drivers/net/ethernet/agere/et131x.c static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) · line 2610
Quoted 6 lines
drivers/net/ethernet/agere/et131x.c +5
-0+ +unmap_first_out: +// unmap header +while (frag--) { + frag--;I don't think you want to decrement frag twice here.
Quoted 10 lines
drivers/net/ethernet/agere/et131x.c +7
-0+ dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_single (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +return -ENOMEM ; }static int send_packet (struct sk_buff *skb,struct et131x_adapter *adapter)