Mesa (master): r600/sb: fix boundary assert for mem-instruction decoding

[GitLab Mirror]

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

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon Jan 18 17:09:07 2021 +0100

r600/sb: fix boundary assert for mem-instruction decoding

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8563>

---

 src/gallium/drivers/r600/sb/sb_bc_decoder.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc_decoder.cpp b/src/gallium/drivers/r600/sb/sb_bc_decoder.cpp
index 4a7f82ba753..b04cb73e22a 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_decoder.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_decoder.cpp
@@ -540,7 +540,8 @@ int bc_decoder::decode_fetch_mem(unsigned & i, bc_fetch& bc) {
 	uint32_t dw2 = dw[i+2];
 
 	i += 4; // MEM instructions align to 4 words boundaries
-	assert(i < ndw);
+
+	assert(i <= ndw);
 
 	MEM_RD_WORD0_R7EGCM w0(dw0);
 	bc.elem_size = w0.get_ELEM_SIZE();