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

Merge "Drop the O_NOFOLLOW flag." am: 0e41945e3a am: ee7d15d542

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679497

Change-Id: Ie059d5363f2b1c0727aee64043a5149e2e679097
This commit is contained in:
Nicolas Geoffray
2021-04-23 12:13:35 +00:00
committed by Automerger Merge Worker
parent 25adb03255 ee7d15d542
commit 7c53c538ac
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/PinnerService.java
View File

@@ -848,9 +848,7 @@ public final class PinnerService extends SystemService {
int mapSize = 0; int mapSize = 0;
try { try {
int openFlags = (OsConstants.O_RDONLY | int openFlags = (OsConstants.O_RDONLY | OsConstants.O_CLOEXEC);
OsConstants.O_CLOEXEC |
OsConstants.O_NOFOLLOW);
fd = Os.open(fileToPin, openFlags, 0); fd = Os.open(fileToPin, openFlags, 0);
mapSize = (int) Math.min(Os.fstat(fd).st_size, Integer.MAX_VALUE); mapSize = (int) Math.min(Os.fstat(fd).st_size, Integer.MAX_VALUE);
address = Os.mmap(0, mapSize, address = Os.mmap(0, mapSize,