From 73c5434c25aed0433207edb7cb636a7e6a5ae65d Mon Sep 17 00:00:00 2001 From: Tim Pambor Date: Thu, 15 Jun 2023 15:06:28 +0000 Subject: [PATCH] virgl: Fix stack overflow in virgl_bind_sampler_states Triggered on hosts with more than 32 samplers. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9207 Fixes: 63c4c559 ("virgl: obtain supported number of shader sampler views from host") Signed-off-by: Tim Pambor Reviewed-by: Gert Wollny Part-of: (cherry picked from commit 1ad79cb84fc3cd5d2a3a4db532ec976ec4bcf5d1) --- .pick_status.json | 2 +- src/gallium/drivers/virgl/virgl_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ee5fd53acae..a474872af4c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1336,7 +1336,7 @@ "description": "virgl: Fix stack overflow in virgl_bind_sampler_states", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "63c4c559cbce22102bdac695db1cb1bf229f68c3" }, diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c index 12c9e511caa..058440e2606 100644 --- a/src/gallium/drivers/virgl/virgl_context.c +++ b/src/gallium/drivers/virgl/virgl_context.c @@ -1182,7 +1182,7 @@ static void virgl_bind_sampler_states(struct pipe_context *ctx, void **samplers) { struct virgl_context *vctx = virgl_context(ctx); - uint32_t handles[32]; + uint32_t handles[PIPE_MAX_SHADER_SAMPLER_VIEWS]; int i; for (i = 0; i < num_samplers; i++) { handles[i] = (unsigned long)(samplers[i]);