am 3fd60b42: Fix issue #7503920: Log spew from vold
* commit '3fd60b428202a0f5f324fccc67c0c0402b9131ba':
Fix issue #7503920: Log spew from vold
diff --git a/CommandListener.cpp b/CommandListener.cpp
index 3b5d2bf..2986cac 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -274,7 +274,7 @@
}
size_t dirent_len = offsetof(struct dirent, d_name) +
- pathconf(directory, _PC_NAME_MAX) + 1;
+ fpathconf(dirfd(d), _PC_NAME_MAX) + 1;
struct dirent *dent = (struct dirent *) malloc(dirent_len);
if (dent == NULL) {
diff --git a/DirectVolume.h b/DirectVolume.h
index de1ed8b..c0139d4 100644
--- a/DirectVolume.h
+++ b/DirectVolume.h
@@ -27,7 +27,7 @@
class DirectVolume : public Volume {
public:
- static const int MAX_PARTITIONS = 4;
+ static const int MAX_PARTITIONS = 32;
protected:
PathCollection *mPaths;
int mDiskMajor;
@@ -37,7 +37,7 @@
int mOrigDiskMinor;
int mOrigPartMinors[MAX_PARTITIONS];
int mDiskNumParts;
- unsigned char mPendingPartMap;
+ unsigned int mPendingPartMap;
int mIsDecrypted;
int mFlags;
diff --git a/Ext4.cpp b/Ext4.cpp
index 290489e..4ec0616 100644
--- a/Ext4.cpp
+++ b/Ext4.cpp
@@ -67,16 +67,18 @@
return rc;
}
-int Ext4::format(const char *fsPath) {
+int Ext4::format(const char *fsPath, const char *mountpoint) {
int fd;
- const char *args[4];
+ const char *args[6];
int rc;
args[0] = MKEXT4FS_PATH;
args[1] = "-J";
- args[2] = fsPath;
- args[3] = NULL;
- rc = logwrap(3, args, 1);
+ args[2] = "-a";
+ args[3] = mountpoint;
+ args[4] = fsPath;
+ args[5] = NULL;
+ rc = logwrap(5, args, 1);
if (rc == 0) {
SLOGI("Filesystem (ext4) formatted OK");
diff --git a/Ext4.h b/Ext4.h
index a09b576..c5ab78a 100644
--- a/Ext4.h
+++ b/Ext4.h
@@ -23,7 +23,7 @@
public:
static int doMount(const char *fsPath, const char *mountPoint, bool ro, bool remount,
bool executable);
- static int format(const char *fsPath);
+ static int format(const char *fsPath, const char *mountpoint);
};
#endif
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index ca5ec84..a1930d1 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -191,7 +191,11 @@
}
memset(mountPath, 0, mountPathLen);
- snprintf(mountPath, mountPathLen, "%s/%s", Volume::LOOPDIR, idHash);
+ int written = snprintf(mountPath, mountPathLen, "%s/%s", Volume::LOOPDIR, idHash);
+ if ((written < 0) || (written >= mountPathLen)) {
+ errno = EINVAL;
+ return -1;
+ }
if (access(mountPath, F_OK)) {
errno = ENOENT;
@@ -215,7 +219,13 @@
return -1;
}
- snprintf(buffer, maxlen, "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(buffer, maxlen, "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (written >= maxlen)) {
+ SLOGE("getAsecMountPath failed for %s: couldn't construct path in buffer", id);
+ errno = EINVAL;
+ return -1;
+ }
+
return 0;
}
@@ -233,7 +243,12 @@
return -1;
}
- snprintf(buffer, maxlen, "%s", asecFileName);
+ int written = snprintf(buffer, maxlen, "%s", asecFileName);
+ if ((written < 0) || (written >= maxlen)) {
+ errno = EINVAL;
+ return -1;
+ }
+
return 0;
}
@@ -281,7 +296,11 @@
const char *asecDir = isExternal ? Volume::SEC_ASECDIR_EXT : Volume::SEC_ASECDIR_INT;
- snprintf(asecFileName, sizeof(asecFileName), "%s/%s.asec", asecDir, id);
+ int written = snprintf(asecFileName, sizeof(asecFileName), "%s/%s.asec", asecDir, id);
+ if ((written < 0) || (size_t(written) >= sizeof(asecFileName))) {
+ errno = EINVAL;
+ return -1;
+ }
if (!access(asecFileName, F_OK)) {
SLOGE("ASEC file '%s' currently exists - destroy it first! (%s)",
@@ -379,8 +398,21 @@
if (wantFilesystem) {
int formatStatus;
+ char mountPoint[255];
+
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("ASEC fs format failed: couldn't construct mountPoint");
+ if (cleanupDm) {
+ Devmapper::destroy(idHash);
+ }
+ Loop::destroyByDevice(loopDevice);
+ unlink(asecFileName);
+ return -1;
+ }
+
if (usingExt4) {
- formatStatus = Ext4::format(dmDevice);
+ formatStatus = Ext4::format(dmDevice, mountPoint);
} else {
formatStatus = Fat::format(dmDevice, numImgSectors);
}
@@ -395,9 +427,6 @@
return -1;
}
- char mountPoint[255];
-
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
if (mkdir(mountPoint, 0000)) {
if (errno != EEXIST) {
SLOGE("Mountpoint creation failed (%s)", strerror(errno));
@@ -474,7 +503,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("ASEC finalize failed: couldn't construct mountPoint");
+ return -1;
+ }
int result = 0;
if (sb.c_opts & ASEC_SB_C_OPTS_EXT4) {
@@ -527,7 +560,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("Unable remount to fix permissions for %s: couldn't construct mountpoint", id);
+ return -1;
+ }
int result = 0;
if ((sb.c_opts & ASEC_SB_C_OPTS_EXT4) == 0) {
@@ -620,14 +657,24 @@
asprintf(&asecFilename2, "%s/%s.asec", dir, id2);
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id1);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id1);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("Rename failed: couldn't construct mountpoint");
+ goto out_err;
+ }
+
if (isMountpointMounted(mountPoint)) {
SLOGW("Rename attempt when src mounted");
errno = EBUSY;
goto out_err;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id2);
+ written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id2);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("Rename failed: couldn't construct mountpoint2");
+ goto out_err;
+ }
+
if (isMountpointMounted(mountPoint)) {
SLOGW("Rename attempt when dst mounted");
errno = EBUSY;
@@ -664,7 +711,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("ASEC unmount failed for %s: couldn't construct mountpoint", id);
+ return -1;
+ }
char idHash[33];
if (!asecHash(id, idHash, sizeof(idHash))) {
@@ -684,7 +735,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::LOOPDIR, idHash);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::LOOPDIR, idHash);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("OBB unmount failed for %s: couldn't construct mountpoint", fileName);
+ return -1;
+ }
return unmountLoopImage(fileName, idHash, fileName, mountPoint, force);
}
@@ -780,7 +835,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("ASEC destroy failed for %s: couldn't construct mountpoint", id);
+ return -1;
+ }
if (isMountpointMounted(mountPoint)) {
if (mDebug) {
@@ -848,7 +907,8 @@
if (asecPath != NULL) {
int written = snprintf(asecPath, asecPathLen, "%s/%s", dir, asecName);
- if (written < 0 || static_cast<size_t>(written) >= asecPathLen) {
+ if ((written < 0) || (size_t(written) >= asecPathLen)) {
+ SLOGE("findAsec failed for %s: couldn't construct ASEC path", id);
free(asecName);
return -1;
}
@@ -867,7 +927,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::ASECDIR, id);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("ASEC mount failed: couldn't construct mountpoint", id);
+ return -1;
+ }
if (isMountpointMounted(mountPoint)) {
SLOGE("ASEC %s already mounted", id);
@@ -1010,7 +1074,11 @@
return -1;
}
- snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::LOOPDIR, idHash);
+ int written = snprintf(mountPoint, sizeof(mountPoint), "%s/%s", Volume::LOOPDIR, idHash);
+ if ((written < 0) || (size_t(written) >= sizeof(mountPoint))) {
+ SLOGE("OBB mount failed: couldn't construct mountpoint", img);
+ return -1;
+ }
if (isMountpointMounted(mountPoint)) {
SLOGE("Image %s already mounted", img);
@@ -1222,10 +1290,15 @@
int fd;
char nodepath[255];
- snprintf(nodepath,
+ int written = snprintf(nodepath,
sizeof(nodepath), "/dev/block/vold/%d:%d",
MAJOR(d), MINOR(d));
+ if ((written < 0) || (size_t(written) >= sizeof(nodepath))) {
+ SLOGE("shareVolume failed: couldn't construct nodepath");
+ return -1;
+ }
+
if ((fd = open(MASS_STORAGE_FILE_PATH, O_WRONLY)) < 0) {
SLOGE("Unable to open ums lunfile (%s)", strerror(errno));
return -1;
@@ -1398,7 +1471,7 @@
}
size_t dirent_len = offsetof(struct dirent, d_name) +
- pathconf(directory, _PC_NAME_MAX) + 1;
+ fpathconf(dirfd(d), _PC_NAME_MAX) + 1;
struct dirent *dent = (struct dirent *) malloc(dirent_len);
if (dent == NULL) {
