dtrace: ensure speculation buffer cleaning does not race with buffer freeing

Orabug: 17553446

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>

diff --git a/dtrace/dtrace_state.c b/dtrace/dtrace_state.c
index 404c05bfd2887212c1e57f62a220a41f4504ef54..6861223512a9ac757d3ea5ac4727119558433448 100644 (file)
--- a/dtrace/dtrace_state.c
+++ b/dtrace/dtrace_state.c
@@ -291,7 +291,8 @@ void dtrace_vstate_fini(dtrace_vstate_t *vstate)
 
 static void dtrace_state_clean(dtrace_state_t *state)
 {
-       if (state->dts_activity == DTRACE_ACTIVITY_INACTIVE)
+       if (state->dts_activity != DTRACE_ACTIVITY_ACTIVE &&
+           state->dts_activity != DTRACE_ACTIVITY_DRAINING)
                return;
 
        dtrace_dynvar_clean(&state->dts_vstate.dtvs_dynvars);