Layers: Rework Intel layer to be more accurate

This shifts the transition page handling into the windows fault handler.
It makes the table traversal from a loop into a recursive call so that
handlers can jump back into the traversal directly.
This commit is contained in:
Mike Auty
2022-03-29 23:33:39 +01:00
parent d0ae932c2e
commit 90ddb057fa
+84 -53
View File
@@ -50,6 +50,7 @@ class Intel(linear.LinearlyMappedLayer):
# These can vary depending on the type of space
self._index_shift = int(math.ceil(math.log2(struct.calcsize(self._entry_format))))
self._structure_position_table: Dict[int, Tuple[str, int, bool]] = {}
@classproperty
@functools.lru_cache()
@@ -102,21 +103,6 @@ class Intel(linear.LinearlyMappedLayer):
translated address lives in and the layer_name that the address
lives in
"""
entry, position = self._translate_entry(offset)
# Now we're done
if not self._page_is_valid(entry):
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
f"Page Fault at entry {hex(entry)} in page entry")
page = self._mask(entry, self._maxphyaddr - 1, position + 1) | self._mask(offset, position, 0)
return page, 1 << (position + 1), self._base_layer
def _translate_entry(self, offset: int) -> Tuple[int, int]:
"""Translates a specific offset based on paging tables.
Returns the translated entry value
"""
# Setup the entry and how far we are through the offset
# Position maintains the number of bits left to process
# We or with 0x1 to ensure our page_map_offset is always valid
@@ -127,45 +113,69 @@ class Intel(linear.LinearlyMappedLayer):
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Entry outside virtual address range: " + hex(entry))
# Run through the offset in various chunks
for (name, size, large_page) in self._structure:
# Check we're valid
if not self._page_is_valid(entry):
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Page Fault at entry " + hex(entry) + " in table " + name)
# Check if we're a large page
if large_page and (entry & (1 << 7)):
# Mask off the PAT bit
if entry & (1 << 12):
entry -= (1 << 12)
# We're a large page, the rest is finished below
# If we want to implement PSE-36, it would need to be done here
break
# Figure out how much of the offset we should be using
start = position
position -= size
index = self._mask(offset, start, position + 1) >> (position + 1)
entry, position = self._translate_entry(offset, position, entry)
# Grab the base address of the table we'll be getting the next entry from
base_address = self._mask(entry, self._maxphyaddr - 1, size + self._index_shift)
# Now we're done
if not self._page_is_valid(entry):
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
f"Page Fault at entry {hex(entry)} in page entry")
page = self._mask(entry, self._maxphyaddr - 1, position + 1) | self._mask(offset, position, 0)
table = self._get_valid_table(base_address)
if table is None:
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Page Fault at entry " + hex(entry) + " in table " + name)
return page, 1 << (position + 1), self._base_layer
# Read the data for the next entry
entry_data = table[(index << self._index_shift):(index << self._index_shift) + self._entry_size]
def _find_structure_index(self, position: int) -> Tuple[str, int, bool]:
if not self._structure_position_table:
counter = self._initial_position
for name, size, large_page in self._structure:
self._structure_position_table[counter] = name, size, large_page
counter -= size
print(self._structure_position_table)
return self._structure_position_table[position]
if INTEL_TRANSLATION_DEBUGGING:
vollog.log(
constants.LOGLEVEL_VVVV, "Entry {} at index {} gives data {} as {}".format(
hex(entry), hex(index), hex(struct.unpack(self._entry_format, entry_data)[0]), name))
def _translate_entry(self, offset: int, position: int, entry: int) -> Tuple[int, int]:
"""Translates a specific offset based on paging tables.
# Read out the new entry from memory
entry, = struct.unpack(self._entry_format, entry_data)
Returns the translated entry value
"""
name, size, large_page = self._find_structure_index(position)
return entry, position
# Check we're present
if not entry & 0x1:
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Page Fault at entry " + hex(entry) + " in table " + name)
# Check if we're a large page
if large_page and (entry & (1 << 7)):
# We're a large page, the rest is finished below
# If we want to implement PSE-36, it would need to be done here
return entry, position
# Figure out how much of the offset we should be using
start = position
position -= size
index = self._mask(offset, start, position + 1) >> (position + 1)
# Grab the base address of the table we'll be getting the next entry from
base_address = self._mask(entry, self._maxphyaddr - 1, size + self._index_shift)
table = self._get_valid_table(base_address)
if table is None:
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Page Fault at entry " + hex(entry) + " in table " + name)
# Read the data for the next entry
entry_data = table[(index << self._index_shift):(index << self._index_shift) + self._entry_size]
if INTEL_TRANSLATION_DEBUGGING:
vollog.log(
constants.LOGLEVEL_VVVV, "Entry {} at index {} gives data {} as {}".format(
hex(entry), hex(index), hex(struct.unpack(self._entry_format, entry_data)[0]), name))
# Read out the new entry from memory
entry, = struct.unpack(self._entry_format, entry_data)
if position < self._page_size_in_bits:
return entry, position
return self._translate_entry(offset, position, entry)
@functools.lru_cache(1025)
def _get_valid_table(self, base_address: int) -> Optional[bytes]:
@@ -321,7 +331,8 @@ class WindowsMixin(Intel):
"""
return bool((entry & 1) or ((entry & 1 << 11) and not entry & 1 << 10))
def _translate_swap(self, layer: Intel, offset: int, bit_offset: int) -> Tuple[int, int, str]:
def _translate_windows(self, layer: Intel, offset: int, bit_offset: int) -> Tuple[int, int, str]:
try:
return super()._translate(offset)
except exceptions.PagedInvalidAddressException as excp:
@@ -331,6 +342,26 @@ class WindowsMixin(Intel):
unknown_bit = bool(entry & (1 << 7))
n = (entry >> 1) & 0xF
vbit = bool(entry & 1)
# Handle transition page
if tbit and not pbit:
position = excp.invalid_bits - 1
name, size, _ = self._find_structure_index(position)
index = self._mask(offset, position, position + size) >> (position + size)
# Grab the base address of the table we'll be getting the next entry from
base_address = self._mask(entry, self._maxphyaddr - 1, size + self._index_shift)
table = self._get_valid_table(base_address)
if table is None:
raise exceptions.PagedInvalidAddressException(self.name, offset, position + 1, entry,
"Page Fault at entry " + hex(
entry) + " in table " + name)
# Read the data for the next entry
entry_data = table[(index << self._index_shift):(index << self._index_shift) + self._entry_size]
super()._translate_entry(offset, excp.invalid_bits, entry)
# Handle Swap failure
if (not tbit and not pbit and not vbit and unknown_bit) and ((entry >> bit_offset) != 0):
swap_offset = entry >> bit_offset << excp.invalid_bits
@@ -353,21 +384,21 @@ class WindowsMixin(Intel):
class WindowsIntel(WindowsMixin, Intel):
def _translate(self, offset):
return self._translate_swap(self, offset, self._page_size_in_bits)
return self._translate_windows(self, offset, self._page_size_in_bits)
class WindowsIntelPAE(WindowsMixin, IntelPAE):
def _translate(self, offset: int) -> Tuple[int, int, str]:
return self._translate_swap(self, offset, self._bits_per_register)
return self._translate_windows(self, offset, self._bits_per_register)
class WindowsIntel32e(WindowsMixin, Intel32e):
# TODO: Fix appropriately in a future release.
# Currently just a temporary workaround to deal with custom bit flag
# Currently just a temprorary workaround to deal with custom bit flag
# in the PFN field for pages in transition state.
# See https://github.com/volatilityfoundation/volatility3/pull/475
_maxphyaddr = 45
def _translate(self, offset: int) -> Tuple[int, int, str]:
return self._translate_swap(self, offset, self._bits_per_register // 2)
return self._translate_windows(self, offset, self._bits_per_register // 2)