diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-12-16 18:05:58 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-12-19 17:50:08 +0900 |
| commit | 3d661a12be5be95da929b19cf4b5976b3c3fb8e9 (patch) | |
| tree | 1161cb644d69652acb2583e7a714da1e962c763f | |
| parent | e2610bf1658971adf44f8558f652ae1a25c9a255 (diff) | |
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" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 127e0711c2..2ee87f9184 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); |