zink: Use the correct array size for signal_values[]
When the size of the signals[] array was changed to 3, the
signal_values[] array was not updated accordingly. If we have a
signal_semaphore and are presenting at the same time, this can lead to
an array overflow and the driver will read some random stack value as
the signal value. This is causing chromium to lock up when running
WebGL.
Fixes: 7f56fd9655 ("zink: it's kopperin' time")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33549>
This commit is contained in:
committed by
Marge Bot
parent
111faf2158
commit
1ffa782227
@@ -619,6 +619,8 @@ typedef enum {
|
||||
ZINK_SUBMIT_MAX
|
||||
} zink_submit;
|
||||
|
||||
#define ZINK_MAX_SIGNALS 3
|
||||
|
||||
static void
|
||||
submit_queue(void *data, void *gdata, int thread_index)
|
||||
{
|
||||
@@ -685,12 +687,12 @@ submit_queue(void *data, void *gdata, int thread_index)
|
||||
si[ZINK_SUBMIT_CMDBUF].pSignalSemaphores = bs->signal_semaphores.data;
|
||||
|
||||
/* then the signal submit with the timeline (fence) semaphore */
|
||||
VkSemaphore signals[3];
|
||||
VkSemaphore signals[ZINK_MAX_SIGNALS];
|
||||
si[ZINK_SUBMIT_SIGNAL].signalSemaphoreCount = !!bs->signal_semaphore;
|
||||
signals[0] = bs->signal_semaphore;
|
||||
si[ZINK_SUBMIT_SIGNAL].pSignalSemaphores = signals;
|
||||
VkTimelineSemaphoreSubmitInfo tsi = {0};
|
||||
uint64_t signal_values[2] = {0};
|
||||
uint64_t signal_values[ZINK_MAX_SIGNALS] = {0};
|
||||
tsi.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO;
|
||||
si[ZINK_SUBMIT_SIGNAL].pNext = &tsi;
|
||||
tsi.pSignalSemaphoreValues = signal_values;
|
||||
@@ -702,6 +704,8 @@ submit_queue(void *data, void *gdata, int thread_index)
|
||||
signals[si[ZINK_SUBMIT_SIGNAL].signalSemaphoreCount++] = bs->present;
|
||||
tsi.signalSemaphoreValueCount = si[ZINK_SUBMIT_SIGNAL].signalSemaphoreCount;
|
||||
|
||||
assert(si[ZINK_SUBMIT_SIGNAL].signalSemaphoreCount <= ZINK_MAX_SIGNALS);
|
||||
assert(tsi.signalSemaphoreValueCount <= ZINK_MAX_SIGNALS);
|
||||
|
||||
VkResult result;
|
||||
if (bs->has_work) {
|
||||
|
||||
Reference in New Issue
Block a user