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

Merge "Fix mount path prefix checking." into klp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2013-10-03 17:18:38 +00:00
committed by Android (Google) Code Review
parent 95867a6524 5786a278a5
commit fe5bf7a7c7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/MountService.java
View File

@@ -2145,6 +2145,10 @@ class MountService extends IMountService.Stub
return -1;
}
if (!appPath.endsWith("/")) {
appPath = appPath + "/";
}
// Try translating the app path into a vold path, but require that it
// belong to the calling package.
String voldPath = maybeTranslatePathForVold(appPath,
@@ -2194,9 +2198,9 @@ class MountService extends IMountService.Stub
}
for (int i = 0; i < appPaths.length; i++) {
final String appPath = appPaths[i].getAbsolutePath();
final String appPath = appPaths[i].getAbsolutePath() + "/";
if (path.startsWith(appPath)) {
path = new File(voldPaths[i], path.substring(appPath.length() + 1))
path = new File(voldPaths[i], path.substring(appPath.length()))
.getAbsolutePath();
if (!path.endsWith("/")) {
path = path + "/";