From b447bfa81c36e91c3cf30bdc432e6eba48afbc53 Mon Sep 17 00:00:00 2001
From: Abyss Watcher <abyss-w4tcher@proton.me>
Date: Thu, 16 Jan 2025 16:24:38 +0100
Subject: [PATCH] remove module tainting proxies

---
 .../framework/plugins/linux/modxview.py       | 16 ++++++++++--
 .../symbols/linux/extensions/__init__.py      | 25 -------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/volatility3/framework/plugins/linux/modxview.py b/volatility3/framework/plugins/linux/modxview.py
index 3655200e8..69c6ac8bb 100644
--- a/volatility3/framework/plugins/linux/modxview.py
+++ b/volatility3/framework/plugins/linux/modxview.py
@@ -140,9 +140,21 @@ class Modxview(interfaces.plugins.PluginInterface):
                 seen_addresses.add(module.vol.offset)
 
                 if self.config.get("plain_taints"):
-                    taints = module.get_taints_as_plain_string()
+                    taints = tainting.Tainting.get_taints_as_plain_string(
+                        self.context,
+                        kernel_name,
+                        module.taints,
+                        True,
+                    )
                 else:
-                    taints = ",".join(module.get_taints_parsed())
+                    taints = ",".join(
+                        tainting.Tainting.get_taints_parsed(
+                            self.context,
+                            kernel_name,
+                            module.taints,
+                            True,
+                        )
+                    )
 
                 yield (
                     0,
diff --git a/volatility3/framework/symbols/linux/extensions/__init__.py b/volatility3/framework/symbols/linux/extensions/__init__.py
index ac2f87df0..289d6c0a4 100644
--- a/volatility3/framework/symbols/linux/extensions/__init__.py
+++ b/volatility3/framework/symbols/linux/extensions/__init__.py
@@ -19,7 +19,6 @@ from volatility3.framework.layers import linear, intel
 from volatility3.framework.objects import utility
 from volatility3.framework.symbols import generic, linux, intermed
 from volatility3.framework.symbols.linux.extensions import elf
-from volatility3.framework.symbols.linux.utilities import tainting
 
 vollog = logging.getLogger(__name__)
 
@@ -279,30 +278,6 @@ class module(generic.GenericIntelProcess):
 
         return None
 
-    def get_taints_as_plain_string(self) -> str:
-        """Convert the module's taints value to a 1-1 character mapping.
-        Convenient wrapper around framework's Tainting capabilities.
-
-        Returns:
-            The raw taints string.
-        """
-        return tainting.Tainting(
-            self._context,
-            linux.LinuxUtilities.get_module_from_volobj_type(self._context, self).name,
-        ).get_taints_as_plain_string(self.taints, True)
-
-    def get_taints_parsed(self) -> List[str]:
-        """Convert the module's taints string to a 1-1 descriptor mapping.
-        Convenient wrapper around framework's Tainting capabilities.
-
-        Returns:
-            A comprehensive (user-friendly) taint descriptor list.
-        """
-        return tainting.Tainting(
-            self._context,
-            linux.LinuxUtilities.get_module_from_volobj_type(self._context, self).name,
-        ).get_taints_parsed(self.taints, True)
-
     @property
     def section_symtab(self):
         if self.has_member("kallsyms"):