add_inode: handle files with multiple $DATA attributes

maharmstone · Jan 1, 2021 · 776de47 · 776de47
1 parent e538754
commit 776de47
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/src/ntfs.cpp b/src/ntfs.cpp
@@ -77,12 +77,12 @@ ntfs_file::ntfs_file(ntfs& dev, uint64_t inode) : dev(dev), inode(inode) {
 }
 
 void read_nonresident_mappings(const ATTRIBUTE_RECORD_HEADER* att, list<mapping>& mappings,
- uint32_t cluster_size) {
+ uint32_t cluster_size, uint64_t vdl) {
  uint64_t next_vcn = att->Form.Nonresident.LowestVcn, current_lcn = 0, current_vcn;
  uint8_t* stream = (uint8_t*)att + att->Form.Nonresident.MappingPairsOffset;
- uint64_t max_cluster = att->Form.Nonresident.ValidDataLength / cluster_size;
+ uint64_t max_cluster = vdl / cluster_size;
 
- if (att->Form.Nonresident.ValidDataLength & (cluster_size - 1))
+ if (vdl & (cluster_size - 1))
  max_cluster++;
 
  if (max_cluster == 0)
@@ -148,7 +148,7 @@ string ntfs_file::read_nonresident_attribute(size_t offset, size_t length, const
  uint32_t cluster_size = dev.boot_sector->BytesPerSector * dev.boot_sector->SectorsPerCluster;
  string ret;
 
- read_nonresident_mappings(att, mappings, cluster_size);
+ read_nonresident_mappings(att, mappings, cluster_size, att->Form.Nonresident.ValidDataLength);
 
  // FIXME - do we need to check that mappings is contiguous and in order?
 
@@ -268,7 +268,7 @@ list<mapping> ntfs_file::read_mappings(enum ntfs_attribute type, const u16string
 
  uint32_t cluster_size = dev.boot_sector->BytesPerSector * dev.boot_sector->SectorsPerCluster;
 
- read_nonresident_mappings(att, mappings, cluster_size);
+ read_nonresident_mappings(att, mappings, cluster_size, att->Form.Nonresident.ValidDataLength);
 
  return false;
  });

diff --git a/src/ntfs2btrfs.cpp b/src/ntfs2btrfs.cpp
@@ -1656,6 +1656,9 @@ static void add_inode(root& r, uint64_t inode, uint64_t ntfs_inode, bool& is_dir
  map<string, tuple<uint32_t, string>> xattrs;
  string filename, wof_compressed_data;
  uint32_t cluster_size = dev.boot_sector->BytesPerSector * dev.boot_sector->SectorsPerCluster;
+ bool processed_data = false;
+ uint16_t compression_unit;
+ uint64_t vdl;
 
  static const uint32_t sector_size = 0x1000; // FIXME
 
@@ -1687,20 +1690,23 @@ static void add_inode(root& r, uint64_t inode, uint64_t ntfs_inode, bool& is_dir
  return true;
  }
 
- if (att->FormCode == NTFS_ATTRIBUTE_FORM::RESIDENT_FORM) {
+ if (att->FormCode == NTFS_ATTRIBUTE_FORM::RESIDENT_FORM && !processed_data) {
  file_size = att->Form.Resident.ValueLength;
 
  inline_data = res_data;
  } else {
- if (file_size == 0)
+ if (!processed_data) {
  file_size = att->Form.Nonresident.FileSize;
+ compression_unit = att->Form.Nonresident.CompressionUnit;
+ vdl = att->Form.Nonresident.ValidDataLength;
+ }
 
- if (att->Form.Nonresident.CompressionUnit != 0) {
+ if (compression_unit != 0) {
  list<mapping> comp_mappings;
  string compdata;
- uint64_t cus = 1 << att->Form.Nonresident.CompressionUnit;
+ uint64_t cus = 1 << compression_unit;
 
- read_nonresident_mappings(att, comp_mappings, cluster_size);
+ read_nonresident_mappings(att, comp_mappings, cluster_size, vdl);
 
  compdata.resize(cus * cluster_size);
 
@@ -1763,9 +1769,11 @@ static void add_inode(root& r, uint64_t inode, uint64_t ntfs_inode, bool& is_dir
  } else {
  // FIXME - if ValidDataLength < FileSize, will need to zero end
 
- read_nonresident_mappings(att, mappings, cluster_size);
+ read_nonresident_mappings(att, mappings, cluster_size, vdl);
  }
  }
+
+ processed_data = true;
  } else { // ADS
  static const char xattr_prefix[] = "user.";
 
@@ -1832,7 +1840,7 @@ static void add_inode(root& r, uint64_t inode, uint64_t ntfs_inode, bool& is_dir
  list<mapping> ads_mappings;
  string ads_data;
 
- read_nonresident_mappings(att, ads_mappings, cluster_size);
+ read_nonresident_mappings(att, ads_mappings, cluster_size, att->Form.Nonresident.ValidDataLength);
 
  ads_data.resize(sector_align(att->Form.Nonresident.FileSize, cluster_size));
  memset(ads_data.data(), 0, ads_data.length());

diff --git a/src/ntfs2btrfs.h b/src/ntfs2btrfs.h
@@ -253,7 +253,7 @@ static inline uint64_t sector_align(uint64_t v, uint64_t s) {
 
 // ntfs.cpp
 void read_nonresident_mappings(const ATTRIBUTE_RECORD_HEADER* att, std::list<mapping>& mappings,
- uint32_t cluster_size);
+ uint32_t cluster_size, uint64_t vdl);
 std::string_view find_sd(uint32_t id, ntfs_file& secure, ntfs& dev);
 void populate_skip_list(ntfs& dev, uint64_t inode, std::list<uint64_t>& skiplist);
 void process_fixups(MULTI_SECTOR_HEADER* header, uint64_t length, unsigned int sector_size);