[Intel-gfx] [PATCH] drm/i915: Do kunmap if renderstate parsing fails

[Siluvery, Arun]

On 16/07/2015 15:36, Mika Kuoppala wrote:
> Kunmap the renderstate page on error path.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem_render_state.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
> index a0201fc..b6492fe 100644
> --- a/drivers/gpu/drm/i915/i915_gem_render_state.c
> +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
> @@ -96,8 +96,10 @@ static int render_state_setup(struct render_state *so)
>   			s = lower_32_bits(r);
>   			if (so->gen >= 8) {
>   				if (i + 1 >= rodata->batch_items ||
> -				    rodata->batch[i + 1] != 0)
> -					return -EINVAL;
> +				    rodata->batch[i + 1] != 0) {
> +					ret = -EINVAL;
> +					goto err_out;
> +				}
>
>   				d[i++] = s;
>   				s = upper_32_bits(r);
> @@ -120,6 +122,10 @@ static int render_state_setup(struct render_state *so)
>   	}
>
>   	return 0;
> +
> +err_out:
> +	kunmap(page);
> +	return ret;
>   }
>
>   void i915_gem_render_state_fini(struct render_state *so)
>

Looks good to me,
Reviewed-by: Arun Siluvery <arun.siluvery at linux.intel.com>

regards
Arun