From 9583ce04db3ac4d892eedfcc635c86eca41958d4 Mon Sep 17 00:00:00 2001
From: Serge Martin <edb@sigluy.net>
Date: Sun, 11 Oct 2020 22:24:26 +0200
Subject: [PATCH] clover: validate image_row_pitch and image_slice_pitch in
 clEnqueueMapImage

v2 (Karol Herbst): remove filling values as it was incorrect.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7069>
---
 src/gallium/frontends/clover/api/transfer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/frontends/clover/api/transfer.cpp b/src/gallium/frontends/clover/api/transfer.cpp
index fdf2716c6a9..1d9663a9d53 100644
--- a/src/gallium/frontends/clover/api/transfer.cpp
+++ b/src/gallium/frontends/clover/api/transfer.cpp
@@ -838,6 +838,12 @@ clEnqueueMapImage(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
    validate_object(q, img, origin, region);
    validate_map_flags(img, flags);
 
+   if (!row_pitch)
+      throw error(CL_INVALID_VALUE);
+
+   if (img.slice_pitch() && !slice_pitch)
+      throw error(CL_INVALID_VALUE);
+
    void *map = img.resource_in(q).add_map(q, flags, blocking, origin, region);
 
    auto hev = create<hard_event>(q, CL_COMMAND_MAP_IMAGE, deps);