Unregister the CUPTI callbacks if needed when the gpu tracer is deleted to prevent them from accessing freed memory.

Change: 151650677

1 files changed, 7 insertions, 0 deletions

diff --git a/tensorflow/core/common_runtime/gpu/gpu_tracer.cc b/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
index 981a654988..e3bd7d7c98 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
@@ -288,6 +288,7 @@ class GPUTracerImpl : public GPUTracer,
                       public port::Tracing::Engine {
  public:
   GPUTracerImpl();
+  ~GPUTracerImpl();
 
   // GPUTracer interface:
   Status Start() override;
@@ -382,6 +383,12 @@ GPUTracerImpl::GPUTracerImpl() {
   enabled_ = false;
 }
 
+GPUTracerImpl::~GPUTracerImpl() {
+  // Unregister the CUPTI callbacks if needed to prevent them from accessing
+  // freed memory.
+  Stop().IgnoreError();
+}
+
 Status GPUTracerImpl::Start() {
   VLOG(1) << "GPUTracer::Start";
   mutex_lock l(mu_);