implement soft-disabling ME using straps

Signed-off-by: Daniel Maslowski <[email protected]>

Author: orangecms

src/clean.rs

@@ -1,11 +1,40 @@
-use intel_fw::me::ME;
+use intel_fw::{
+    ifd::{IFD, IfdError},
+    me::ME,
+};
 use log::warn;
 
 pub struct Options {
     pub relocate: bool,
+    pub disable_me: bool,
+    pub disable_me_only: bool,
 }
 
-pub fn clean(me: &ME, data: &mut [u8], options: Options) -> Result<Vec<u8>, String> {
+pub fn clean(
+    ifd: &Result<IFD, IfdError>,
+    me: &ME,
+    data: &mut [u8],
+    options: Options,
+) -> Result<Vec<u8>, String> {
+    if (options.disable_me || options.disable_me_only)
+        && let Ok(ifd) = ifd
+    {
+        let mut new_ifd = ifd.clone();
+        if let Err(e) = new_ifd.disable_me(&me.generation, &me.version) {
+            let msg = format!("Could not disable ME: {e}");
+            if options.disable_me_only {
+                return Err(msg);
+            }
+            warn!("{msg}");
+        } else {
+            let new_ifd = new_ifd.to_vec();
+            let size = new_ifd.len();
+            data[..size].copy_from_slice(&new_ifd);
+        }
+        if options.disable_me_only {
+            return Ok(data.to_vec());
+        }
+    }
     let mut new_me = me.clone();
     new_me.fpt_area.clean();
     if options.relocate {

src/main.rs

@@ -148,7 +148,11 @@ fn main() {
                 debug!("  Retain FTPR modules:     {keep_modules}");
                 debug!("  Relocate FTPR partition: {relocate}");
                 debug!("  Truncate empty parts:    {truncate}");
-                let disable_me = soft_disable || soft_disable_only;
+                let disable_me = match (soft_disable, soft_disable_only) {
+                    (true, false) => "yes",
+                    (false, false) => "no",
+                    (_, true) => "only this and nothing more",
+                };
                 debug!("  Soft disable ME:         {disable_me}");
                 debug!("");
                 if let Some(allowlist) = whitelist {
@@ -179,8 +183,12 @@ fn main() {
                 let Ok(me) = me_res else {
                     return;
                 };
-                let opts = clean::Options { relocate };
-                match clean::clean(&me, &mut data, opts) {
+                let opts = clean::Options {
+                    relocate,
+                    disable_me: soft_disable,
+                    disable_me_only: soft_disable_only,
+                };
+                match clean::clean(&fw.ifd, &me, &mut data, opts) {
                     Ok(data) => {
                         if let Some(out_file) = output {
                             let mut file = fs::File::create(out_file).unwrap();