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

Commit 6bcc0f05 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libfiemap: Fix removal of corrupted split fiemaps." am: 4e2362ea am:... 

Merge "libfiemap: Fix removal of corrupted split fiemaps." am: 4e2362ea am: a697f796 am: 7ffa7cfe am: 4a6bd3f2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1771597

Change-Id: I839015a4a37689ea6fec109c53f839f8fe98ce50
parents 18cadeff 4a6bd3f2

fs_mgr/libfiemap/fiemap_writer_test.cpp

+22 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <fcntl.h>

#include <inttypes.h>

#include <linux/limits.h>

#include <stdint.h>

#include <stdlib.h>

#include <string.h>
@@ -299,6 +300,27 @@ TEST_F(SplitFiemapTest, DeleteOnFail) { 
    ASSERT_EQ(errno, ENOENT);

}



TEST_F(SplitFiemapTest, CorruptSplit) {

    unique_fd fd(open(testfile.c_str(), O_RDWR | O_CREAT | O_TRUNC, 0700));

    ASSERT_GE(fd, 0);



    // Make a giant random string.

    std::vector<char> data;

    for (size_t i = 0x1; i < 0x7f; i++) {

        for (size_t j = 0; j < 100; j++) {

            data.emplace_back(i);

        }

    }

    ASSERT_GT(data.size(), PATH_MAX);



    data.emplace_back('\n');



    ASSERT_TRUE(android::base::WriteFully(fd, data.data(), data.size()));

    fd = {};



    ASSERT_TRUE(SplitFiemap::RemoveSplitFiles(testfile));

}



static string ReadSplitFiles(const std::string& base_path, size_t num_files) {

    std::string result;

    for (int i = 0; i < num_files; i++) {

fs_mgr/libfiemap/split_fiemap_writer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ bool SplitFiemap::RemoveSplitFiles(const std::string& file_path, std::string* me 
    std::vector<std::string> files;

    if (GetSplitFileList(file_path, &files)) {

        for (const auto& file : files) {

            if (access(file.c_str(), F_OK) != 0 && (errno == ENOENT || errno == ENAMETOOLONG)) {

                continue;

            }

            ok &= android::base::RemoveFileIfExists(file, message);

        }

    }