cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a possible out-of-bounds access in error checking when NUM_*_PARAMS is 0

Browse Source
This commit is contained in:
jpekkila
2020-01-28 18:43:03 +02:00
parent 7685d8a830
commit 89f4d08b6c
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/kernels/kernels.cu
View File

@@ -101,6 +101,10 @@ acDeviceLoadScalarUniform(const Device device, const Stream stream, const AcReal
const AcReal value) const AcReal value)
{ {
cudaSetDevice(device->id); cudaSetDevice(device->id);
if (param < 0 || param >= NUM_REAL_PARAMS) {
fprintf(stderr, "WARNING: invalid AcRealParam %d\n", param);
}
if (!is_valid(value)) { if (!is_valid(value)) {
fprintf(stderr, "WARNING: Passed an invalid value %g to device constant %s. Skipping.\n", fprintf(stderr, "WARNING: Passed an invalid value %g to device constant %s. Skipping.\n",
(double)value, realparam_names[param]); (double)value, realparam_names[param]);
@@ -121,6 +125,10 @@ acDeviceLoadVectorUniform(const Device device, const Stream stream, const AcReal
const AcReal3 value) const AcReal3 value)
{ {
cudaSetDevice(device->id); cudaSetDevice(device->id);
if (param < 0 || param >= NUM_REAL3_PARAMS) {
fprintf(stderr, "WARNING: invalid AcReal3Param %d\n", param);
}
if (!is_valid(value)) { if (!is_valid(value)) {
fprintf(stderr, fprintf(stderr,
"WARNING: Passed an invalid value (%g, %g, %g) to device constant %s. Skipping.\n", "WARNING: Passed an invalid value (%g, %g, %g) to device constant %s. Skipping.\n",
@@ -142,6 +150,10 @@ acDeviceLoadIntUniform(const Device device, const Stream stream, const AcIntPara
const int value) const int value)
{ {
cudaSetDevice(device->id); cudaSetDevice(device->id);
if (param < 0 || param >= NUM_INT_PARAMS) {
fprintf(stderr, "WARNING: invalid AcIntParam %d\n", param);
}
if (!is_valid(value)) { if (!is_valid(value)) {
fprintf(stderr, "WARNING: Passed an invalid value %d to device constant %s. Skipping.\n", fprintf(stderr, "WARNING: Passed an invalid value %d to device constant %s. Skipping.\n",
value, intparam_names[param]); value, intparam_names[param]);
@@ -162,6 +174,10 @@ acDeviceLoadInt3Uniform(const Device device, const Stream stream, const AcInt3Pa
const int3 value) const int3 value)
{ {
cudaSetDevice(device->id); cudaSetDevice(device->id);
if (param < 0 || param >= NUM_INT3_PARAMS) {
fprintf(stderr, "WARNING: invalid AcInt3Param %d\n", param);
}
if (!is_valid(value.x) || !is_valid(value.y) || !is_valid(value.z)) { if (!is_valid(value.x) || !is_valid(value.y) || !is_valid(value.z)) {
fprintf( fprintf(
stderr, stderr,