2016-11-29 06:49:43

by Christophe JAILLET

Subject: [PATCH] drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'

'vmw_cotable_alloc()' returns an error pointer on error, not NULL.
Propagate the error code, instead of returning -ENOMEM unconditionally

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 443d1ed00de7..d1aee9860033 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -209,8 +209,8 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) {
uctx->cotables[i] = vmw_cotable_alloc(dev_priv,
&uctx->res, i);
- if (unlikely(uctx->cotables[i] == NULL)) {
- ret = -ENOMEM;
+ if (unlikely(IS_ERR(uctx->cotables[i]))) {
+ ret = PTR_ERR(uctx->cotables[i]);
goto out_cotables;
}
}
--
2.9.3

2016-11-29 18:52:14

by Sinclair Yeh

Subject: Re: [PATCH] drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'

Good catch.

Reviewed-by: Sinclair Yeh <[email protected]>

On Tue, Nov 29, 2016 at 07:49:19AM +0100, Christophe JAILLET wrote:
> 'vmw_cotable_alloc()' returns an error pointer on error, not NULL.
> Propagate the error code, instead of returning -ENOMEM unconditionally
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
> index 443d1ed00de7..d1aee9860033 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
> @@ -209,8 +209,8 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
> for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) {
> uctx->cotables[i] = vmw_cotable_alloc(dev_priv,
> &uctx->res, i);
> - if (unlikely(uctx->cotables[i] == NULL)) {
> - ret = -ENOMEM;
> + if (unlikely(IS_ERR(uctx->cotables[i]))) {
> + ret = PTR_ERR(uctx->cotables[i]);
> goto out_cotables;
> }
> }
> --
> 2.9.3
>