2022-06-13 06:36:24

by Yang Yingliang

Subject: [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline()

If dma_fence_unwrap_merge() fails, it should return error code
in drm_syncobj_transfer_to_timeline()

Fixes: ec8d985ff26f ("drm: use dma_fence_unwrap_merge() in drm_syncobj")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/gpu/drm/drm_syncobj.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index bbad9e4696e7..0c2be8360525 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -874,8 +874,10 @@ static int drm_syncobj_transfer_to_timeline(struct drm_file *file_private,

fence = dma_fence_unwrap_merge(tmp);
dma_fence_put(tmp);
- if (!fence)
+ if (!fence) {
+ ret = -ENOMEM;
goto err_put_timeline;
+ }

chain = dma_fence_chain_alloc();
if (!chain) {
--
2.25.1

2022-06-13 07:25:30

by Christian König

Subject: Re: [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline()

Am 13.06.22 um 08:34 schrieb Yang Yingliang:
> If dma_fence_unwrap_merge() fails, it should return error code
> in drm_syncobj_transfer_to_timeline()
>
> Fixes: ec8d985ff26f ("drm: use dma_fence_unwrap_merge() in drm_syncobj")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>

Reviewed-by: Christian König <[email protected]>

Going to push that in a minute.

Thanks,
Christian.

> ---
> drivers/gpu/drm/drm_syncobj.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
> index bbad9e4696e7..0c2be8360525 100644
> --- a/drivers/gpu/drm/drm_syncobj.c
> +++ b/drivers/gpu/drm/drm_syncobj.c
> @@ -874,8 +874,10 @@ static int drm_syncobj_transfer_to_timeline(struct drm_file *file_private,
>
> fence = dma_fence_unwrap_merge(tmp);
> dma_fence_put(tmp);
> - if (!fence)
> + if (!fence) {
> + ret = -ENOMEM;
> goto err_put_timeline;
> + }
>
> chain = dma_fence_chain_alloc();
> if (!chain) {