commit 1200d64fbe7c703fbb3a0337ee8d3dcf94fe9e52
author Nanley Chery <nanley.g.chery@intel.com> Mon Feb 27 10:23:33 2017 -0800
committer Emil Velikov <emil.l.velikov@gmail.com> Thu Mar 16 01:34:00 2017 +0000
tree a0a386aaf6545855c998da90f8bd1e76eaec90ce
parent fbaf5955eee6b028e7f301dd0609a413f5aa2f3e

anv/pass: Avoid accessing attachment array out of bounds

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
(cherry picked from commit 178f9e5f29f3fe83eb5af99a69d7c583c30d21d1)

src/intel/vulkan/anv_pass.c

diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c
index 2df1826..a8b2470 100644
--- a/src/intel/vulkan/anv_pass.c
+++ b/src/intel/vulkan/anv_pass.c
@@ -116,13 +116,15 @@
          for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) {
             uint32_t a = desc->pInputAttachments[j].attachment;
             subpass->input_attachments[j] = a;
-            pass->attachments[a].usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
-            pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_INPUT;
-            pass->attachments[a].last_subpass_idx = i;
+            if (a != VK_ATTACHMENT_UNUSED) {
+               pass->attachments[a].usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
+               pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_INPUT;
+               pass->attachments[a].last_subpass_idx = i;
 
-            if (desc->pDepthStencilAttachment &&
-                a == desc->pDepthStencilAttachment->attachment)
-               subpass->has_ds_self_dep = true;
+               if (desc->pDepthStencilAttachment &&
+                   a == desc->pDepthStencilAttachment->attachment)
+                  subpass->has_ds_self_dep = true;
+            }
          }
       }
 
@@ -133,9 +135,11 @@
          for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) {
             uint32_t a = desc->pColorAttachments[j].attachment;
             subpass->color_attachments[j] = a;
-            pass->attachments[a].usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
-            pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW;
-            pass->attachments[a].last_subpass_idx = i;
+            if (a != VK_ATTACHMENT_UNUSED) {
+               pass->attachments[a].usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+               pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW;
+               pass->attachments[a].last_subpass_idx = i;
+            }
          }
       }