From: Michel Dänzer Date: Fri, 16 Dec 2016 09:05:58 +0000 (+0900) Subject: cso: Don't restore nr_samplers in cso_restore_fragment_samplers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d661a12be5be95da929b19cf4b5976b3c3fb8e9;p=mesa.git cso: Don't restore nr_samplers in cso_restore_fragment_samplers If info->nr_samplers > ctx->nr_fragment_samplers_saved, the assignment would prevent cso_single_sampler_done from unbinding the no longer used samplers from the driver, which could result in use-after-free. This is probably unlikely to happen in practice though. Cc: "12.0 13.0" Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 127e0711c20..2ee87f91848 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -1275,7 +1275,6 @@ cso_restore_fragment_samplers(struct cso_context *ctx) { struct sampler_info *info = &ctx->samplers[PIPE_SHADER_FRAGMENT]; - info->nr_samplers = ctx->nr_fragment_samplers_saved; memcpy(info->samplers, ctx->fragment_samplers_saved, sizeof(info->samplers)); cso_single_sampler_done(ctx, PIPE_SHADER_FRAGMENT);