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

Commit dc392262 authored by Tao Bao's avatar Tao Bao
Browse files

udpater: Call fsync() after rename(). 

We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: Ide2e753a2038691d472b6ee173cbf68ac998a084
parent 302779e7

updater/blockimg.cpp

+20 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <dirent.h>

#include <fcntl.h>

#include <inttypes.h>

#include <libgen.h>

#include <linux/fs.h>

#include <pthread.h>

#include <stdarg.h>
@@ -686,6 +687,7 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf 
    char *cn = NULL;

    int fd = -1;

    int rc = -1;

    int dfd = -1;

    int res;

    struct stat st;
@@ -744,6 +746,20 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf 
        goto wsout;

    }



    const char* dname;

    dname = dirname(cn);

    dfd = TEMP_FAILURE_RETRY(open(dname, O_RDONLY | O_DIRECTORY));



    if (dfd == -1) {

        fprintf(stderr, "failed to open \"%s\" failed: %s\n", dname, strerror(errno));

        goto wsout;

    }



    if (fsync(dfd) == -1) {

        fprintf(stderr, "fsync \"%s\" failed: %s\n", dname, strerror(errno));

        goto wsout;

    }



    rc = 0;



wsout:
@@ -751,6 +767,10 @@ wsout: 
        close(fd);

    }



    if (dfd != -1) {

        close(dfd);

    }



    if (fn) {

        free(fn);

    }