| Message ID | 20220314013448.2340361-1-jiasheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0f74b29a4f53627376cf5a5fb7b0b3fa748a0b2b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] atm: eni: Add check for dma_map_single | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 14 Mar 2022 09:34:48 +0800 you wrote: > As the potential failure of the dma_map_single(), > it should be better to check it and return error > if fails. > > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > > [...] Here is the summary with links: - [v2] atm: eni: Add check for dma_map_single https://git.kernel.org/netdev/net/c/0f74b29a4f53 You are awesome, thank you!
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 422753d52244..a31ffe16e626 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -1112,6 +1112,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags); skb_data3 = skb->data[3]; paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len, DMA_TO_DEVICE); + if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr)) + return enq_next; ENI_PRV_PADDR(skb) = paddr; /* prepare DMA queue entries */ j = 0;
As the potential failure of the dma_map_single(), it should be better to check it and return error if fails. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- Changelog: v1 -> v2 * Change 1. Change "enq_jam" to "enq_next". --- drivers/atm/eni.c | 2 ++ 1 file changed, 2 insertions(+)