From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu, 11 Apr 2019 07:09:59 +0000 (+0200)
Subject: panfrost: Guard against reading past end of buffer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f1c686bca3f98ef8b1e5f1e6b781a8dd2f2c417;p=mesa.git

panfrost: Guard against reading past end of buffer

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

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;