diff --git a/volatility/framework/automagic/__init__.py b/volatility/framework/automagic/__init__.py index 163fb02ac..1ef748ab0 100644 --- a/volatility/framework/automagic/__init__.py +++ b/volatility/framework/automagic/__init__.py @@ -34,4 +34,4 @@ def run(automagics, context, configurable, config_path = ""): requirement.add_requirement(req) for automagic in automagics: - automagic(context, requirement, config_path) + automagic(context, config_path, requirement) diff --git a/volatility/framework/automagic/construct_layers.py b/volatility/framework/automagic/construct_layers.py index be7b06f27..e05089c3e 100644 --- a/volatility/framework/automagic/construct_layers.py +++ b/volatility/framework/automagic/construct_layers.py @@ -9,7 +9,7 @@ class ConstructionMagic(interfaces.automagic.AutomagicInterface): """Runs through the requirement tree and from the bottom up attempts to construct all TranslationLayerRequirements""" priority = 10 - def __call__(self, context, requirement, config_path): + def __call__(self, context, config_path, requirement): if not requirement.validate(context, config_path): # Having called validate at the top level tells us both that we need to dig deeper # but also ensures that TranslationLayerRequirements have got the correct subrequirements if their class is populated diff --git a/volatility/framework/automagic/windows.py b/volatility/framework/automagic/windows.py index 6039c1cd2..1df86db02 100644 --- a/volatility/framework/automagic/windows.py +++ b/volatility/framework/automagic/windows.py @@ -123,7 +123,7 @@ class PageMapOffsetHelper(interfaces.automagic.AutomagicInterface): self(node, config_path) return True - def __call__(self, context, requirement, config_path): + def __call__(self, context, config_path, requirement): useful = [] sub_config_path = interfaces.configuration.path_join(config_path, requirement.name) if isinstance(requirement, requirements.TranslationLayerRequirement): @@ -156,7 +156,7 @@ class PageMapOffsetHelper(interfaces.automagic.AutomagicInterface): break else: for subreq in requirement.requirements.values(): - self(context, subreq, sub_config_path) + self(context, sub_config_path, subreq) if __name__ == '__main__':