commit 20fa94354b4fc4bc02813b8c04bd5b2d1230eb83
author Alexis Hetu <sugoi@google.com> Mon Sep 19 09:44:56 2022 -0400
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 19 14:20:22 2022 +0000
tree a42013d05f9f0fb27cb7c5d9358520e127e228e2
parent 9e96423f7ed2c22eea3274e3f4c20dd5ca80a18c

Respect pipelineStageCreationFeedbackCount

PipelineCreationFeedback was writing past the end of the
pPipelineStageCreationFeedbacks array by not respecting
the value of pipelineStageCreationFeedbackCount. This CL
adds bounds checks to make sure this doesn't happen.

Tests: dEQP-VK.pipeline.monolithic.creation_feedback.graphics_tests.vertex_stage_fragment_stage_no_cache_zero_out_feedback_cout
Bug: b/247516349
Change-Id: I62601f84b9044bb6752e48dad3861a5694cd14ac
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/68330
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>

src/Vulkan/VkPipeline.cpp

diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
index 01fc82d..504cd4d 100644
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -154,7 +154,7 @@
 
 	void stageCreationBegins(uint32_t stage)
 	{
-		if(pipelineCreationFeedback)
+		if(pipelineCreationFeedback && (stage < pipelineCreationFeedback->pipelineStageCreationFeedbackCount))
 		{
 			// Record stage creation begin time
 			pipelineCreationFeedback->pPipelineStageCreationFeedbacks[stage].duration = now();
@@ -167,14 +167,17 @@
 		{
 			pipelineCreationFeedback->pPipelineCreationFeedback->flags |=
 			    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT;
-			pipelineCreationFeedback->pPipelineStageCreationFeedbacks[stage].flags |=
-			    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT;
+			if(stage < pipelineCreationFeedback->pipelineStageCreationFeedbackCount)
+			{
+				pipelineCreationFeedback->pPipelineStageCreationFeedbacks[stage].flags |=
+				    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT;
+			}
 		}
 	}
 
 	void stageCreationEnds(uint32_t stage)
 	{
-		if(pipelineCreationFeedback)
+		if(pipelineCreationFeedback && (stage < pipelineCreationFeedback->pipelineStageCreationFeedbackCount))
 		{
 			pipelineCreationFeedback->pPipelineStageCreationFeedbacks[stage].flags |=
 			    VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;