2018-08-08 06:27:44

by Gerd Hoffmann

[permalink] [raw]
Subject: [PATCH] dma-buf: fix sanity check in dma_buf_export

Commit 09ea0dfbf972 made map_atomic and map function pointers optional,
but didn't adapt the sanity check in dma_buf_export. Fix that.

Note that the atomic map interface has been removed altogether meanwhile
(commit f664a52695), therefore we have to remove the map check only.

Signed-off-by: Gerd Hoffmann <[email protected]>
---
drivers/dma-buf/dma-buf.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 13884474d1..02f7f9a899 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -405,7 +405,6 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
|| !exp_info->ops->map_dma_buf
|| !exp_info->ops->unmap_dma_buf
|| !exp_info->ops->release
- || !exp_info->ops->map
|| !exp_info->ops->mmap)) {
return ERR_PTR(-EINVAL);
}
--
2.9.3



2018-08-08 08:28:30

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH] dma-buf: fix sanity check in dma_buf_export

On Wed, Aug 08, 2018 at 08:25:40AM +0200, Gerd Hoffmann wrote:
> Commit 09ea0dfbf972 made map_atomic and map function pointers optional,
> but didn't adapt the sanity check in dma_buf_export. Fix that.
>
> Note that the atomic map interface has been removed altogether meanwhile
> (commit f664a52695), therefore we have to remove the map check only.
>
> Signed-off-by: Gerd Hoffmann <[email protected]>

Chris Wilson just submitted the exact same patch ...
-Daniel

> ---
> drivers/dma-buf/dma-buf.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index 13884474d1..02f7f9a899 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -405,7 +405,6 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
> || !exp_info->ops->map_dma_buf
> || !exp_info->ops->unmap_dma_buf
> || !exp_info->ops->release
> - || !exp_info->ops->map
> || !exp_info->ops->mmap)) {
> return ERR_PTR(-EINVAL);
> }
> --
> 2.9.3
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch