plugins/loader: fix deadlock when resetting/uninstalling a plugin

pbo-linaro · stsquad · commit c07cd110a182 · 2025-04-09T10:35:29.000+01:00
Reported and fixed by Dmitry Kurakin. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2901 Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-Id: <20250404032027.430575-2-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/plugins/loader.c b/plugins/loader.c
@@ -370,7 +370,7 @@ static void plugin_reset_destroy(struct qemu_plugin_reset_data *data)
 {
     qemu_rec_mutex_lock(&plugin.lock);
     plugin_reset_destroy__locked(data);
-    qemu_rec_mutex_lock(&plugin.lock);
+    qemu_rec_mutex_unlock(&plugin.lock);
 }
 
 static void plugin_flush_destroy(CPUState *cpu, run_on_cpu_data arg)

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ static void plugin_reset_destroy(struct qemu_plugin_reset_data *data)`
`370`	`370`	`{`
`371`	`371`	`qemu_rec_mutex_lock(&plugin.lock);`
`372`	`372`	`plugin_reset_destroy__locked(data);`
`373`		`- qemu_rec_mutex_lock(&plugin.lock);`
	`373`	`+ qemu_rec_mutex_unlock(&plugin.lock);`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`static void plugin_flush_destroy(CPUState *cpu, run_on_cpu_data arg)`