Skip to content

Fix overflow in SetMaxResource* related functions. #460

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 1 commit into from
Jun 28, 2022
Merged

Fix overflow in SetMaxResource* related functions. #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 8 deletions src/gpgmm/d3d12/CapsD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "gpgmm/d3d12/CapsD3D12.h"

#include "gpgmm/d3d12/ErrorD3D12.h"
#include "gpgmm/utils/Limits.h"

#include <memory>

Expand All @@ -25,12 +26,13 @@ namespace gpgmm::d3d12 {
ReturnIfFailed(
device->CheckFeatureSupport(D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, &feature,
sizeof(D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT)));
// Prevent possible overflow.
if (feature.MaxGPUVirtualAddressBitsPerResource == 0) {
return E_INVALIDARG;
// Check for overflow.
if (feature.MaxGPUVirtualAddressBitsPerResource == 0 ||
feature.MaxGPUVirtualAddressBitsPerResource > GetNumOfBits<uint64_t>()) {
return E_FAIL;
}

*sizeOut = (1 << (feature.MaxGPUVirtualAddressBitsPerResource - 1)) - 1;
*sizeOut = (1ull << (feature.MaxGPUVirtualAddressBitsPerResource - 1)) - 1;
return S_OK;
}

Expand All @@ -39,12 +41,13 @@ namespace gpgmm::d3d12 {
ReturnIfFailed(
device->CheckFeatureSupport(D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, &feature,
sizeof(D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT)));
// Prevent possible overflow.
if (feature.MaxGPUVirtualAddressBitsPerResource == 0) {
return E_INVALIDARG;
// Check for overflow.
if (feature.MaxGPUVirtualAddressBitsPerResource == 0 ||
feature.MaxGPUVirtualAddressBitsPerResource > GetNumOfBits<uint64_t>()) {
return E_FAIL;
}

*sizeOut = (1 << (feature.MaxGPUVirtualAddressBitsPerResource - 1)) - 1;
*sizeOut = (1ull << (feature.MaxGPUVirtualAddressBitsPerResource - 1)) - 1;
return S_OK;
}

Expand Down
7 changes: 7 additions & 0 deletions src/gpgmm/utils/Limits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#ifndef GPGMM_UTILS_LIMITS_H_
#define GPGMM_UTILS_LIMITS_H_

#include <climits> // CHAR_BIT
#include <cstdint>
#include <limits>

Expand All @@ -24,6 +25,12 @@ namespace gpgmm {
static constexpr uint64_t kInvalidSize = std::numeric_limits<uint64_t>::max();
static constexpr uint64_t kInvalidIndex = std::numeric_limits<uint64_t>::max();

template <typename T>
constexpr size_t GetNumOfBits() {
static_assert(CHAR_BIT == 8, "Size of a char is not 8 bits.");
return sizeof(T) * CHAR_BIT;
}

} // namespace gpgmm

#endif // GPGMM_UTILS_LIMITS_H_