From 2474d3ecc46bb8b2d4628beaa891d9b8a6205c36 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 24 May 2020 15:40:39 -0700 Subject: [PATCH] rbug: Fix rbug_delete_vs_state lock acquisition. Fix warning reported by Coverity Scan. Double unlock (LOCK) double_unlock: mtx_unlock unlocks rb_pipe->call_mutex while it is unlocked. Fixes: 07838ff990a7 ("rbug: Use the call mutex") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3023 Signed-off-by: Vinson Lee Reviewed-by: Jakob Bornecrantz Part-of: (cherry picked from commit c0c03f4772fef361137bba5681b71215aca107d1) --- .pick_status.json | 2 +- src/gallium/auxiliary/driver_rbug/rbug_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e4dd8a5e91f..be9cc414e82 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3262,7 +3262,7 @@ "description": "rbug: Fix rbug_delete_vs_state lock acquisition.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "07838ff990a74e3acd95de7042042b49ecc51570" }, diff --git a/src/gallium/auxiliary/driver_rbug/rbug_context.c b/src/gallium/auxiliary/driver_rbug/rbug_context.c index a36f3377e8c..c391adff244 100644 --- a/src/gallium/auxiliary/driver_rbug/rbug_context.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_context.c @@ -490,7 +490,7 @@ rbug_delete_vs_state(struct pipe_context *_pipe, struct rbug_context *rb_pipe = rbug_context(_pipe); struct rbug_shader *rb_shader = rbug_shader(_vs); - mtx_unlock(&rb_pipe->call_mutex); + mtx_lock(&rb_pipe->call_mutex); rbug_shader_destroy(rb_pipe, rb_shader); mtx_unlock(&rb_pipe->call_mutex); }