Skip to content

[SPARK-9364] Fix array out of bounds and use-after-free bugs in UnsafeExternalSorter #7680

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

Closed
JoshRosen wants to merge 3 commits into from
Closed

[SPARK-9364] Fix array out of bounds and use-after-free bugs in UnsafeExternalSorter #7680

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8abcf82
Properly decrement freeSpaceInCurrentPage in UnsafeExternalSorter
JoshRosen Jul 26, 2015
f4cf91d
Fix use-after-free bug in UnsafeExternalRowSorter.
JoshRosen Jul 26, 2015
590f311
null out row
JoshRosen Jul 27, 2015
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
7 changes: 6 additions & 1 deletion core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ private long getMemoryUsage() {
return sorter.getMemoryUsage() + (allocatedPages.size() * (long) PAGE_SIZE);
}

@VisibleForTesting
public int getNumberOfAllocatedPages() {
return allocatedPages.size();
}

public long freeMemory() {
long memoryFreed = 0;
for (MemoryBlock block : allocatedPages) {
Expand Down Expand Up @@ -257,7 +262,7 @@ public void insertRecord(
currentPagePosition,
lengthInBytes);
currentPagePosition += lengthInBytes;

freeSpaceInCurrentPage -= totalSpaceRequired;
sorter.insertRecord(recordAddress, prefix);
}

Expand Down
19 changes: 19 additions & 0 deletions ...src/test/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorterSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,23 @@ public void testSortingEmptyArrays() throws Exception {
}
}

@Test
public void testFillingPage() throws Exception {
final UnsafeExternalSorter sorter = new UnsafeExternalSorter(
memoryManager,
shuffleMemoryManager,
blockManager,
taskContext,
recordComparator,
prefixComparator,
1024,
new SparkConf());

byte[] record = new byte[16];
while (sorter.getNumberOfAllocatedPages() < 2) {
sorter.insertRecord(record, PlatformDependent.BYTE_ARRAY_OFFSET, record.length, 0);
}
sorter.freeMemory();
}

}
7 changes: 5 additions & 2 deletions sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,13 @@ public InternalRow next() {
numFields,
sortedIterator.getRecordLength());
if (!hasNext()) {
row.copy(); // so that we don't have dangling pointers to freed page
UnsafeRow copy = row.copy(); // so that we don't have dangling pointers to freed page
row.pointTo(null, 0, 0, 0); // so that we don't keep references to the base object
Copy link
Contributor

@rxin rxin Jul 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just

row = null ?

Copy link
Contributor Author

@JoshRosen JoshRosen Jul 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

cleanupResources();
return copy;
} else {
return row;
}
return row;
} catch (IOException e) {
cleanupResources();
// Scala iterators don't declare any checked exceptions, so we need to use this hack
Expand Down