2017-03-24 22:56:01

by Alexey Khoroshilov

Subject: [PATCH] irda: vlsi_ir: fix check for dma mapping errors

vlsi_alloc_ring() checks for dma mapping errors by comparison
returned address with zero, while pci_dma_mapping_error() should be used.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/net/irda/vlsi_ir.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index ffedad2a360a..15b920086251 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -418,8 +418,9 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
memset(rd, 0, sizeof(*rd));
rd->hw = hwmap + i;
rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA);
- if (rd->buf == NULL ||
- !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
+ if (rd->buf)
+ busaddr = pci_map_single(pdev, rd->buf, len, dir);
+ if (rd->buf == NULL || pci_dma_mapping_error(pdev, busaddr)) {
if (rd->buf) {
net_err_ratelimited("%s: failed to create PCI-MAP for %p\n",
__func__, rd->buf);
@@ -430,8 +431,7 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
rd = r->rd + j;
busaddr = rd_get_addr(rd);
rd_set_addr_status(rd, 0, 0);
- if (busaddr)
- pci_unmap_single(pdev, busaddr, len, dir);
+ pci_unmap_single(pdev, busaddr, len, dir);
kfree(rd->buf);
rd->buf = NULL;
}
--
2.7.4

2017-03-25 10:19:54

by Sergei Shtylyov

Subject: Re: [PATCH] irda: vlsi_ir: fix check for dma mapping errors

Hello!

On 3/25/2017 1:48 AM, Alexey Khoroshilov wrote:

> vlsi_alloc_ring() checks for dma mapping errors by comparison

DMA. Comparing.

> returned address with zero, while pci_dma_mapping_error() should be used.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>
> ---
> drivers/net/irda/vlsi_ir.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
> index ffedad2a360a..15b920086251 100644
> --- a/drivers/net/irda/vlsi_ir.c
> +++ b/drivers/net/irda/vlsi_ir.c
> @@ -418,8 +418,9 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
> memset(rd, 0, sizeof(*rd));
> rd->hw = hwmap + i;
> rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA);
> - if (rd->buf == NULL ||
> - !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
> + if (rd->buf)
> + busaddr = pci_map_single(pdev, rd->buf, len, dir);
> + if (rd->buf == NULL || pci_dma_mapping_error(pdev, busaddr)) {

'!rd->buf' is preferred in the networking trees.

[...]

MBR, Sergei

2017-03-26 03:24:07

by David Miller

Subject: Re: [PATCH] irda: vlsi_ir: fix check for dma mapping errors

From: Alexey Khoroshilov <[email protected]>
Date: Sat, 25 Mar 2017 01:48:08 +0300

> vlsi_alloc_ring() checks for dma mapping errors by comparison
> returned address with zero, while pci_dma_mapping_error() should be used.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>

Applied.