audio: Don't free hw resources until after hw backend is stopped

When stopping an audio voice, call the audio backend's fini method before calling audio_pcm_hw_free_resources_ rather than afterwards. This allows backends which use helper threads (like pulseaudio) to terminate those threads before the conv_buf or mix_buf are freed and avoids race conditions where the helper may access a NULL pointer or freed memory. Cc: [email protected] Reviewed-by: Gerd Hoffmann <[email protected]> Signed-off-by: Peter Maydell <[email protected]> Message-id: [email protected]
seanbruno · Dec 22, 2014 · b28fb27 · b28fb27
1 parent 7e58e2a
commit b28fb27
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/audio/audio_template.h b/audio/audio_template.h
@@ -191,9 +191,9 @@ static void glue (audio_pcm_hw_gc_, TYPE) (HW **hwp)
         audio_detach_capture (hw);
 #endif
         QLIST_REMOVE (hw, entries);
+        glue (hw->pcm_ops->fini_, TYPE) (hw);
         glue (s->nb_hw_voices_, TYPE) += 1;
         glue (audio_pcm_hw_free_resources_ ,TYPE) (hw);
-        glue (hw->pcm_ops->fini_, TYPE) (hw);
         g_free (hw);
         *hwp = NULL;
     }