Skip to content

Fix use-after-free in Runtime::DestroyAgents() cleanup ordering #3240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shwetagkhatri wants to merge 2 commits into
base: develop
Choose a base branch
from
+22 −4
Open

Fix use-after-free in Runtime::DestroyAgents() cleanup ordering #3240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3641db8
Fix use-after-free in Runtime::DestroyAgents() cleanup ordering
ShwetakAMD Feb 12, 2026
833dd34
rocrtst: Avoid double shutdown under ASAN
ShwetakAMD Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion projects/rocr-runtime/rocrtst/common/base_rocr_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@
#include "gtest/gtest.h"
#include "hsa/hsa.h"

#if !defined(ROCRTST_ASAN)
#if defined(__has_feature)
#if __has_feature(address_sanitizer)
#define ROCRTST_ASAN 1
#endif
#endif
#if defined(__SANITIZE_ADDRESS__)
#define ROCRTST_ASAN 1
#endif
#endif

namespace rocrtst {


Expand Down Expand Up @@ -106,16 +117,22 @@ hsa_status_t CommonCleanUp(BaseRocR* test) {
}

test->clear_code_object();

err = hsa_shut_down();
RET_IF_HSA_UTILS_ERR(err);

// Ensure that HSA is actually closed.
#ifndef ROCRTST_ASAN
// Ensure that HSA is actually closed.
hsa_status_t check = hsa_shut_down();
if (check != HSA_STATUS_ERROR_NOT_INITIALIZED) {
EXPECT_EQ(HSA_STATUS_ERROR_NOT_INITIALIZED, check) << "hsa_init reference count was too high.";
return HSA_STATUS_ERROR;
}

#else
// Avoid a second shutdown under ASAN; its device allocator may be unloaded.
#endif

std::string intr_val;

if (test->orig_hsa_enable_interrupt() == nullptr) {
Expand Down
7 changes: 4 additions & 3 deletions projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ void Runtime::RegisterDriver(std::unique_ptr<Driver> driver) {
void Runtime::DestroyAgents() {
agents_by_node_.clear();

// Clear system regions before destroying agents to prevent use-after-free
// when agent destructors access region memory
system_regions_fine_.clear();
system_regions_coarse_.clear();
std::for_each(gpu_agents_.begin(), gpu_agents_.end(), DeleteObject());
gpu_agents_.clear();

Expand All @@ -271,9 +275,6 @@ void Runtime::DestroyAgents() {
aie_agents_.clear();

region_gpu_ = NULL;

system_regions_fine_.clear();
system_regions_coarse_.clear();
}

void Runtime::DestroyDrivers() {
Expand Down
Loading