Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c981837 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "fs_mgr: BLKGETSIZE causes memory corruption"

parents 1c3d7840 d93adf55

fs_mgr/fs_mgr_format.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ extern void reset_ext4fs_info(); 




static int format_ext4(char *fs_blkdev, char *fs_mnt_point)

static int format_ext4(char *fs_blkdev, char *fs_mnt_point)

{

{

    unsigned int nr_sec;

    uint64_t dev_sz;

    int fd, rc = 0;

    int fd, rc = 0;





    if ((fd = open(fs_blkdev, O_WRONLY, 0644)) < 0) {

    if ((fd = open(fs_blkdev, O_WRONLY, 0644)) < 0) {
@@ -41,7 +41,7 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point) 
        return -1;

        return -1;

    }

    }





    if ((ioctl(fd, BLKGETSIZE, &nr_sec)) == -1) {

    if ((ioctl(fd, BLKGETSIZE64, &dev_sz)) == -1) {

        ERROR("Cannot get block device size.  %s\n", strerror(errno));

        ERROR("Cannot get block device size.  %s\n", strerror(errno));

        close(fd);

        close(fd);

        return -1;

        return -1;
@@ -49,7 +49,7 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point) 




    /* Format the partition using the calculated length */

    /* Format the partition using the calculated length */

    reset_ext4fs_info();

    reset_ext4fs_info();

    info.len = ((off64_t)nr_sec * 512);

    info.len = (off64_t)dev_sz;





    /* Use make_ext4fs_internal to avoid wiping an already-wiped partition. */

    /* Use make_ext4fs_internal to avoid wiping an already-wiped partition. */

    rc = make_ext4fs_internal(fd, NULL, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL);

    rc = make_ext4fs_internal(fd, NULL, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL);