Skip to content

Fix rare out-of-bounds write in FLACCL #353

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
ledoge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix rare out-of-bounds write in FLACCL #353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5911db
Fix rare out-of-bounds write in FLACCL
ledoge Sep 28, 2024
408b68d
Factor out common expression
ledoge Sep 29, 2024
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
25 changes: 20 additions & 5 deletions CUETools.Codecs.FLACCL/flac.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,7 +2125,7 @@ void clRiceEncoding(
flush(&bw);
}
#else
__local uint data[GROUP_SIZE];
__local uint data[GROUP_SIZE*2];
__local volatile int mypos[GROUP_SIZE+1];
#if 0
__local int brp[256];
Expand All @@ -2148,6 +2148,7 @@ void clRiceEncoding(
brp[offs] = best_rice_parameters[(get_group_id(0) << max_porder) + offs];
#endif
data[tid] = 0;
data[tid + GROUP_SIZE] = 0;
barrier(CLK_LOCAL_MEM_FENCE);
const int bs = task.blocksize;
int start = task.encodingOffset;
Expand Down Expand Up @@ -2218,9 +2219,16 @@ void clRiceEncoding(
if (qpos1 && qval1) atomic_or(&data[qpos0 + 1], qval1);
}
barrier(CLK_LOCAL_MEM_FENCE);
if ((start32 + tid) * 32 <= start)
output[start32 + tid] = as_int(as_char4(data[tid]).wzyx);
remainder = data[start / 32 - start32];
int write = (start32 + tid) * 32;
if (write <= start) {
output[start32 + tid] = as_int(as_char4(data[tid]).wzyx);
if (write + GROUP_SIZE * 32 <= start)
{
output[start32 + tid + GROUP_SIZE] = as_int(as_char4(data[tid + GROUP_SIZE]).wzyx);
data[tid + GROUP_SIZE] = 0;
}
}
}
if (pos < bs)
{
Expand Down Expand Up @@ -2279,9 +2287,16 @@ void clRiceEncoding(
if (qpos1 && qval1) atomic_or(&data[qpos0 + 1], qval1);
}
barrier(CLK_LOCAL_MEM_FENCE);
if ((start32 + tid) * 32 <= start)
output[start32 + tid] = as_int(as_char4(data[tid]).wzyx);
remainder = data[start / 32 - start32];
int write = (start32 + tid) * 32;
if (write <= start) {
output[start32 + tid] = as_int(as_char4(data[tid]).wzyx);
if (write + GROUP_SIZE * 32 <= start)
{
output[start32 + tid + GROUP_SIZE] = as_int(as_char4(data[tid + GROUP_SIZE]).wzyx);
data[tid + GROUP_SIZE] = 0;
}
}
}
// if (tid == 0 && start != task.encodingOffset - task.headerLen + task.size)
//printf("size mismatch: %d != %d\n", start, task.encodingOffset - task.headerLen + task.size);
Expand Down