Fix heap-buffer-overflow in radix_sort_parallel
#2075
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for pytorch-fbgemm-docs canceled.
|
|
@malfet has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
r-barnes
approved these changes
Oct 13, 2023
malfet
force-pushed
the
malfet-patch-2
branch
from
83f0f43
to
37d9d02
Compare
|
@malfet has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Summary:
Setting `histogram_ps[RDX_HIST_SIZE * (nthreads - 1) + 127] = offset;` in `combine_prefix_sum_for_msb` is guaranteed to result in `heap-buffer-overflow` if bucket is not empty during the scatter stage (as all values of `histogram_ps` should be strictly less than `element_count`
Factor out common code from `RadixSortTest.cc` into `test_tempalte` and add regression test for buffer overflow, which before the test will fail as follows:
```
[ RUN ] cpuKernelTest.raidx_sort_heap_overflow
/home/nshulga/git/pytorch/FBGEMM/test/RadixSortTest.cc:36: Failure
Expected equality of these values:
expected_keys
Which is: { 2, 3, 5, -1, -1, 2147483647, 2147483647, 2147483647 }
keys
Which is: { -1, -1, -1, -1, -1, -1, -1, -1 }
/home/nshulga/git/pytorch/FBGEMM/test/RadixSortTest.cc:37: Failure
Expected equality of these values:
expected_values
Which is: { 1, 4, 6, 7, 8, 2, 3, 5 }
values
Which is: { 2147483647, 4, 6, 7, 8, 6, 7, 8 }
[ FAILED ] cpuKernelTest.raidx_sort_heap_overflow (0 ms)
```
Will fix pytorch/pytorch#111189 once FBGEMM is updated to the correct version
Reviewed By: kit1980, jianyuh
Differential Revision: D50256504
Pulled By: malfet
facebook-github-bot
force-pushed
the
malfet-patch-2
branch
from
37d9d02
to
621d854
Compare
|
This pull request was exported from Phabricator. Differential Revision: D50256504 |
malfet
added a commit
that referenced
this pull request
Nov 2, 2023
Summary:
Setting `histogram_ps[RDX_HIST_SIZE * (nthreads - 1) + 127] = offset;` in `combine_prefix_sum_for_msb` is guaranteed to result in `heap-buffer-overflow` if bucket is not empty during the scatter stage (as all values of `histogram_ps` should be strictly less than `element_count`
Factor out common code from `RadixSortTest.cc` into `test_tempalte` and add regression test for buffer overflow, which before the test will fail as follows:
```
[ RUN ] cpuKernelTest.raidx_sort_heap_overflow
/home/nshulga/git/pytorch/FBGEMM/test/RadixSortTest.cc:36: Failure
Expected equality of these values:
expected_keys
Which is: { 2, 3, 5, -1, -1, 2147483647, 2147483647, 2147483647 }
keys
Which is: { -1, -1, -1, -1, -1, -1, -1, -1 }
/home/nshulga/git/pytorch/FBGEMM/test/RadixSortTest.cc:37: Failure
Expected equality of these values:
expected_values
Which is: { 1, 4, 6, 7, 8, 2, 3, 5 }
values
Which is: { 2147483647, 4, 6, 7, 8, 6, 7, 8 }
[ FAILED ] cpuKernelTest.raidx_sort_heap_overflow (0 ms)
```
Will fix pytorch/pytorch#111189 once FBGEMM is updated to the correct version
Pull Request resolved: #2075
Reviewed By: kit1980, jianyuh
Differential Revision: D50256504
Pulled By: malfet
fbshipit-source-id: f805607595e324999cea07dcacdee8317a008221
(cherry picked from commit 70c6e83)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Setting
histogram_ps[RDX_HIST_SIZE * (nthreads - 1) + 127] = offset;incombine_prefix_sum_for_msbis guaranteed to result inheap-buffer-overflowif bucket is not empty during the scatter stage (as all values ofhistogram_psshould be strictly less thanelement_countFactor out common code from
RadixSortTest.ccintotest_tempalteand add regression test for buffer overflow, which before the test will fail as follows:Will fix pytorch/pytorch#111189 once FBGEMM is updated to the correct version