Mesa (master): panfrost: Guard against reading past end of buffer

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8f1c686bca3f98ef8b1e5f1e6b781a8dd2f2c417
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f1c686bca3f98ef8b1e5f1e6b781a8dd2f2c417

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Thu Apr 11 09:09:59 2019 +0200

panfrost: Guard against reading past end of buffer

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>

---

 src/gallium/drivers/panfrost/pan_swizzle.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/panfrost/pan_swizzle.c b/src/gallium/drivers/panfrost/pan_swizzle.c
index 291bd1f88ae..52a907ddd55 100644
--- a/src/gallium/drivers/panfrost/pan_swizzle.c
+++ b/src/gallium/drivers/panfrost/pan_swizzle.c
@@ -97,6 +97,9 @@ swizzle_bpp1_align16(int width, int height, int source_stride, int block_pitch,
 
                 ++y;
 
+                if (y >= height)
+                        break;
+
                 {
                         int block_y = y & ~(0x0f);
                         int rem_y = y & 0x0f;