diff options
author | Ken Sumrall <ksumrall@android.com> | 2012-06-18 10:52:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:52:20 -0700 |
commit | 51d1ae176ece369db099ce5f5b775bc475f14353 (patch) | |
tree | 81cc6499b3193d152fcc6204ed9e2ca5679f4604 | |
parent | fc676b69bd7e6975d52bc8397d14e5583e00df49 (diff) | |
parent | a79260500a869f867118a6e5289c6e5a0353558f (diff) | |
download | system_vold-51d1ae176ece369db099ce5f5b775bc475f14353.zip system_vold-51d1ae176ece369db099ce5f5b775bc475f14353.tar.gz system_vold-51d1ae176ece369db099ce5f5b775bc475f14353.tar.bz2 |
am a7926050: am 425524db: Unmount all asec apps before encrypting
* commit 'a79260500a869f867118a6e5289c6e5a0353558f':
Unmount all asec apps before encrypting
-rw-r--r-- | VolumeManager.cpp | 57 | ||||
-rw-r--r-- | VolumeManager.h | 2 | ||||
-rw-r--r-- | cryptfs.c | 7 |
3 files changed, 66 insertions, 0 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index f5c254f..1c48932 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -24,6 +24,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/mount.h> +#include <dirent.h> #include <linux/kdev_t.h> @@ -1360,6 +1361,62 @@ int VolumeManager::unmountVolume(const char *label, bool force, bool revert) { return v->unmountVol(force, revert); } +extern "C" int vold_unmountAllAsecs(void) { + int rc; + + VolumeManager *vm = VolumeManager::Instance(); + rc = vm->unmountAllAsecsInDir(Volume::SEC_ASECDIR_EXT); + if (vm->unmountAllAsecsInDir(Volume::SEC_ASECDIR_INT)) { + rc = -1; + } + return rc; +} + +#define ID_BUF_LEN 256 +#define ASEC_SUFFIX ".asec" +#define ASEC_SUFFIX_LEN (sizeof(ASEC_SUFFIX) - 1) +int VolumeManager::unmountAllAsecsInDir(const char *directory) { + DIR *d = opendir(directory); + int rc = 0; + + if (!d) { + SLOGE("Could not open asec dir %s", directory); + return -1; + } + + size_t dirent_len = offsetof(struct dirent, d_name) + + pathconf(directory, _PC_NAME_MAX) + 1; + + struct dirent *dent = (struct dirent *) malloc(dirent_len); + if (dent == NULL) { + SLOGE("Failed to allocate memory for asec dir"); + return -1; + } + + struct dirent *result; + while (!readdir_r(d, dent, &result) && result != NULL) { + if (dent->d_name[0] == '.') + continue; + if (dent->d_type != DT_REG) + continue; + size_t name_len = strlen(dent->d_name); + if (name_len > 5 && name_len < (ID_BUF_LEN + ASEC_SUFFIX_LEN - 1) && + !strcmp(&dent->d_name[name_len - 5], ASEC_SUFFIX)) { + char id[ID_BUF_LEN]; + strlcpy(id, dent->d_name, name_len - 4); + if (unmountAsec(id, true)) { + /* Register the error, but try to unmount more asecs */ + rc = -1; + } + } + } + closedir(d); + + free(dent); + + return rc; +} + /* * Looks up a volume by it's label or mount-point */ diff --git a/VolumeManager.h b/VolumeManager.h index 3802503..4399b76 100644 --- a/VolumeManager.h +++ b/VolumeManager.h @@ -136,6 +136,7 @@ public: Volume *lookupVolume(const char *label); int getNumDirectVolumes(void); int getDirectVolumeList(struct volume_info *vol_list); + int unmountAllAsecsInDir(const char *directory); private: VolumeManager(); @@ -150,6 +151,7 @@ extern "C" { int vold_disableVol(const char *label); int vold_getNumDirectVolumes(void); int vold_getDirectVolumeList(struct volume_info *v); + int vold_unmountAllAsecs(void); #ifdef __cplusplus } #endif @@ -1214,6 +1214,13 @@ int cryptfs_enable(char *howarg, char *passwd) property_set("vold.decrypt", "trigger_shutdown_framework"); SLOGD("Just asked init to shut down class main\n"); + if (vold_unmountAllAsecs()) { + /* Just report the error. If any are left mounted, + * umounting /data below will fail and handle the error. + */ + SLOGE("Error unmounting internal asecs"); + } + property_get("ro.crypto.fuse_sdcard", fuse_sdcard, ""); if (!strcmp(fuse_sdcard, "true")) { /* This is a device using the fuse layer to emulate the sdcard semantics |