Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper duping / closing of FileDescriptors

Browse Source 
While looking into another bug, I noticed that the file descriptors
do not get properly duped when converting to HidlMemory and that they
aren't explicitly closed when creating a temporary instance of
SharedMemory.

Test: Manual verification of ST functionality, which uses these
      utilities.
Fixes: 188931943
Change-Id: I76322c56c58be5db8f1a40eb20eb3b96552412f9
This commit is contained in:
Ytai Ben-Tsvi
2021-05-21 14:26:03 -07:00
parent 52fbf36936
commit cad4e327bf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/os/HidlMemoryUtil.java
View File

@@ -76,8 +76,7 @@ public final class HidlMemoryUtil {
return new HidlMemory("ashmem", 0, null);
}
try {
SharedMemory shmem = SharedMemory.create(name != null ? name : "", input.length);
try (SharedMemory shmem = SharedMemory.create(name != null ? name : "", input.length)) {
ByteBuffer buffer = shmem.mapReadWrite();
buffer.put(input);
shmem.unmap(buffer);
@@ -119,8 +118,7 @@ public final class HidlMemoryUtil {
return new HidlMemory("ashmem", 0, null);
}
try {
SharedMemory shmem = SharedMemory.create(name != null ? name : "", input.size());
try (SharedMemory shmem = SharedMemory.create(name != null ? name : "", input.size())) {
ByteBuffer buffer = shmem.mapReadWrite();
for (Byte b : input) {
buffer.put(b);
@@ -214,8 +212,12 @@ public final class HidlMemoryUtil {
if (fd == null) {
return new HidlMemory("ashmem", 0, null);
}
NativeHandle handle = new NativeHandle(fd, true);
return new HidlMemory("ashmem", size, handle);
try {
NativeHandle handle = new NativeHandle(Os.dup(fd), true);
return new HidlMemory("ashmem", size, handle);
} catch (ErrnoException e) {
throw new RuntimeException(e);
}
}
private static ByteBuffer getBuffer(@NonNull HidlMemory mem) {