gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8a0fde27: am e9623fed: Merge "Fixed type mismatch for ioctl(BLKGETSIZE)"

Browse Source 
* commit '8a0fde272be430f66b2e5db6236aa732d2ba6efc':
  Fixed type mismatch for ioctl(BLKGETSIZE)
gugelfrei
Elliott Hughes 9 years ago committed by Android Git Automerger
parent 36b7b0c681 8a0fde272b
commit 2a8c10965a
7 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File

39
Fat.cpp
Unescape View File

@ -227,28 +227,35 @@ int Fat::format(const char *fsPath, unsigned int numSectors, bool wipe) {
}
void Fat::wipe(const char *fsPath, unsigned int numSectors) {
int fd;
unsigned long long range[2];
fd = open(fsPath, O_RDWR);
if (fd >= 0) {
if (numSectors == 0) {
numSectors = get_blkdev_size(fd);
}
if (numSectors == 0) {
SLOGE("Fat wipe failed to determine size of %s", fsPath);
int fd = open(fsPath, O_RDWR);
if (fd == -1) {
SLOGE("Fat wipe failed to open device %s", fsPath);
return;
}
if (numSectors == 0) {
unsigned long nr_sec;
get_blkdev_size(fd, &nr_sec);
if (nr_sec > UINT32_MAX) {
SLOGE("Too many sectors for FAT: %ld", nr_sec);
close(fd);
return;
}
range[0] = 0;
range[1] = (unsigned long long)numSectors * 512;
if (ioctl(fd, BLKDISCARD, &range) < 0) {
SLOGE("Fat wipe failed to discard blocks on %s", fsPath);
} else {
SLOGI("Fat wipe %d sectors on %s succeeded", numSectors, fsPath);
}
numSectors = nr_sec;
}
if (numSectors == 0) {
SLOGE("Fat wipe failed to determine size of %s", fsPath);
close(fd);
return;
}
range[0] = 0;
range[1] = (unsigned long long)numSectors * 512;
if (ioctl(fd, BLKDISCARD, &range) < 0) {
SLOGE("Fat wipe failed to discard blocks on %s", fsPath);
} else {
SLOGE("Fat wipe failed to open device %s", fsPath);
SLOGI("Fat wipe %d sectors on %s succeeded", numSectors, fsPath);
}
close(fd);
}

6
Loop.cpp
Unescape View File

@ -35,6 +35,7 @@
#include <sysutils/SocketClient.h>
#include "Loop.h"
#include "Asec.h"
#include "VoldUtil.h"
#include "sehandle.h"
int Loop::dumpState(SocketClient *c) {
@ -296,7 +297,7 @@ int Loop::resizeImageFile(const char *file, unsigned int numSectors) {
return 0;
}
int Loop::lookupInfo(const char *loopDevice, struct asec_superblock *sb, unsigned int *nr_sec) {
int Loop::lookupInfo(const char *loopDevice, struct asec_superblock *sb, unsigned long *nr_sec) {
int fd;
struct asec_superblock buffer;
@ -306,7 +307,8 @@ int Loop::lookupInfo(const char *loopDevice, struct asec_superblock *sb, unsigne
return -1;
}
if (ioctl(fd, BLKGETSIZE, nr_sec)) {
get_blkdev_size(fd, nr_sec);
if (*nr_sec == 0) {
SLOGE("Failed to get loop size (%s)", strerror(errno));
destroyByDevice(loopDevice);
close(fd);

2
Loop.h
Unescape View File

@ -27,7 +27,7 @@ public:
static const int LOOP_MAX = 4096;
public:
static int lookupActive(const char *id, char *buffer, size_t len);
static int lookupInfo(const char *loopDevice, struct asec_superblock *sb, unsigned int *nr_sec);
static int lookupInfo(const char *loopDevice, struct asec_superblock *sb, unsigned long *nr_sec);
static int create(const char *id, const char *loopFile, char *loopDeviceBuffer, size_t len);
static int destroyByDevice(const char *loopDevice);
static int destroyByFile(const char *loopFile);

11
VoldUtil.c
Unescape View File

@ -17,13 +17,8 @@
#include <sys/ioctl.h>
#include <linux/fs.h>
unsigned int get_blkdev_size(int fd)
{
unsigned int nr_sec;
if ( (ioctl(fd, BLKGETSIZE, &nr_sec)) == -1) {
nr_sec = 0;
void get_blkdev_size(int fd, unsigned long* nr_sec) {
if ((ioctl(fd, BLKGETSIZE, nr_sec)) == -1) {
*nr_sec = 0;
}
return nr_sec;
}

2
VoldUtil.h
Unescape View File

@ -22,7 +22,7 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
__BEGIN_DECLS
unsigned int get_blkdev_size(int fd);
void get_blkdev_size(int fd, unsigned long* nr_sec);
__END_DECLS
#endif

14
VolumeManager.cpp
Unescape View File

@ -52,6 +52,7 @@
#include "Devmapper.h"
#include "Process.h"
#include "Asec.h"
#include "VoldUtil.h"
#include "cryptfs.h"
#define MASS_STORAGE_FILE_PATH "/sys/class/android_usb/android0/f_mass_storage/lun/file"
@ -759,7 +760,7 @@ int VolumeManager::finalizeAsec(const char *id) {
return -1;
}
unsigned int nr_sec = 0;
unsigned long nr_sec = 0;
struct asec_superblock sb;
if (Loop::lookupInfo(loopDevice, &sb, &nr_sec)) {
@ -822,7 +823,7 @@ int VolumeManager::fixupAsecPermissions(const char *id, gid_t gid, const char* f
return -1;
}
unsigned int nr_sec = 0;
unsigned long nr_sec = 0;
struct asec_superblock sb;
if (Loop::lookupInfo(loopDevice, &sb, &nr_sec)) {
@ -1297,7 +1298,7 @@ int VolumeManager::mountAsec(const char *id, const char *key, int ownerUid, bool
char dmDevice[255];
bool cleanupDm = false;
unsigned int nr_sec = 0;
unsigned long nr_sec = 0;
struct asec_superblock sb;
if (Loop::lookupInfo(loopDevice, &sb, &nr_sec)) {
@ -1403,7 +1404,7 @@ int VolumeManager::mountObb(const char *img, const char *key, int ownerGid) {
char dmDevice[255];
bool cleanupDm = false;
int fd;
unsigned int nr_sec = 0;
unsigned long nr_sec = 0;
if ((fd = open(loopDevice, O_RDWR)) < 0) {
SLOGE("Failed to open loopdevice (%s)", strerror(errno));
@ -1411,7 +1412,8 @@ int VolumeManager::mountObb(const char *img, const char *key, int ownerGid) {
return -1;
}
if (ioctl(fd, BLKGETSIZE, &nr_sec)) {
get_blkdev_size(fd, &nr_sec);
if (nr_sec == 0) {
SLOGE("Failed to get loop size (%s)", strerror(errno));
Loop::destroyByDevice(loopDevice);
close(fd);
@ -1420,7 +1422,7 @@ int VolumeManager::mountObb(const char *img, const char *key, int ownerGid) {
close(fd);
if (setupDevMapperDevice(dmDevice, sizeof(loopDevice), loopDevice, img,key, idHash , nr_sec, &cleanupDm, mDebug)) {
if (setupDevMapperDevice(dmDevice, sizeof(loopDevice), loopDevice, img,key, idHash, nr_sec, &cleanupDm, mDebug)) {
Loop::destroyByDevice(loopDevice);
return -1;
}

31
cryptfs.c
Unescape View File

@ -417,7 +417,6 @@ static int get_crypt_ftr_info(char **metadata_fname, off64_t *off)
int fd;
char key_loc[PROPERTY_VALUE_MAX];
char real_blkdev[PROPERTY_VALUE_MAX];
unsigned int nr_sec;
int rc = -1;
if (!cached_data) {
@ -429,7 +428,9 @@ static int get_crypt_ftr_info(char **metadata_fname, off64_t *off)
return -1;
}
if ((nr_sec = get_blkdev_size(fd))) {
unsigned long nr_sec = 0;
get_blkdev_size(fd, &nr_sec);
if (nr_sec != 0) {
/* If it's an encrypted Android partition, the last 16 Kbytes contain the
* encryption info footer and key, and plenty of bytes to spare for future
* growth.
@ -1905,17 +1906,22 @@ int cryptfs_setup_volume(const char *label, int major, int minor,
char real_blkdev[MAXPATHLEN], crypto_blkdev[MAXPATHLEN];
struct crypt_mnt_ftr sd_crypt_ftr;
struct stat statbuf;
unsigned int nr_sec;
int fd;
sprintf(real_blkdev, "/dev/block/vold/%d:%d", major, minor);
get_crypt_ftr_and_key(&sd_crypt_ftr);
/* Update the fs_size field to be the size of the volume */
fd = open(real_blkdev, O_RDONLY);
nr_sec = get_blkdev_size(fd);
int fd = open(real_blkdev, O_RDONLY);
if (fd == -1) {
SLOGE("Cannot open volume %s\n", real_blkdev);
return -1;
}
unsigned long nr_sec = 0;
get_blkdev_size(fd, &nr_sec);
close(fd);
if (nr_sec == 0) {
SLOGE("Cannot get size of volume %s\n", real_blkdev);
return -1;
@ -2931,9 +2937,8 @@ int cryptfs_enable_internal(char *howarg, int crypt_type, char *passwd,
{
int how = 0;
char crypto_blkdev[MAXPATHLEN], real_blkdev[MAXPATHLEN];
unsigned long nr_sec;
unsigned char decrypted_master_key[KEY_LEN_BYTES];
int rc=-1, fd, i;
int rc=-1, i;
struct crypt_mnt_ftr crypt_ftr;
struct crypt_persist_data *pdata;
char encrypted_state[PROPERTY_VALUE_MAX];
@ -2982,8 +2987,14 @@ int cryptfs_enable_internal(char *howarg, int crypt_type, char *passwd,
fs_mgr_get_crypt_info(fstab, 0, real_blkdev, sizeof(real_blkdev));
/* Get the size of the real block device */
fd = open(real_blkdev, O_RDONLY);
if ( (nr_sec = get_blkdev_size(fd)) == 0) {
int fd = open(real_blkdev, O_RDONLY);
if (fd == -1) {
SLOGE("Cannot open block device %s\n", real_blkdev);
goto error_unencrypted;
}
unsigned long nr_sec;
get_blkdev_size(fd, &nr_sec);
if (nr_sec == 0) {
SLOGE("Cannot get size of block device %s\n", real_blkdev);
goto error_unencrypted;
}

Write Preview
Loading…
Cancel
Save