Skip to content

[UR] Fix some issues in CL PlatformGet turned up by static analysis. #19002

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

Merged
merged 2 commits into from
Jun 17, 2025
+8 −1
Merged

[UR] Fix some issues in CL PlatformGet turned up by static analysis. #19002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32884a6
[UR] Fix some issues in CL PlatformGet turned up by static analysis.
aarongreig Jun 16, 2025
0aae3c9
Revent lock change.
aarongreig Jun 17, 2025
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
9 changes: 8 additions & 1 deletion unified-runtime/source/adapters/opencl/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,14 @@ urPlatformGet(ur_adapter_handle_t, uint32_t NumEntries,
static std::mutex adapterPopulationMutex{};
ur_adapter_handle_t Adapter = nullptr;
UR_RETURN_ON_FAILURE(urAdapterGet(1, &Adapter, nullptr));
if (Adapter && !(Adapter->NumPlatforms)) {
if (!Adapter) {
// The only operation urAdapterGet really performs is allocating the adapter
// handle via new, so no adapter handle here almost certainly means memory
// problems.
return UR_RESULT_ERROR_OUT_OF_RESOURCES;
}

if (Adapter->NumPlatforms == 0) {
std::lock_guard guard{adapterPopulationMutex};

// It's possible for urPlatformGet, if ran on multiple threads, to enter
Expand Down