From d7af343b730cf3c20656f0613caa445f03a309de Mon Sep 17 00:00:00 2001
From: Xynnn007 <xynnn@linux.alibaba.com>
Date: Fri, 16 Aug 2024 15:54:48 +0800
Subject: [PATCH] AA: avoid creating AAEL if it is disabled

Before this commit, if we disabled eventlog recording in AA's config,
there will still be a file `/run/attestation-agent/eventlog` but with no
contents.

This file would be collected by tdx attester, treated as a valid AAEL.
But on CoCo-AS side the AAEL parser will fail because nothing is in it.

This commit will avoid creating this file once we disabled in AA's
config.

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
---
 .../attestation-agent/src/lib.rs              | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/attestation-agent/attestation-agent/src/lib.rs b/attestation-agent/attestation-agent/src/lib.rs
index e5d28c9b3..7fc5de415 100644
--- a/attestation-agent/attestation-agent/src/lib.rs
+++ b/attestation-agent/attestation-agent/src/lib.rs
@@ -79,7 +79,7 @@ pub trait AttestationAPIs {
 pub struct AttestationAgent {
     config: Config,
     attester: BoxedAttester,
-    eventlog: Mutex<EventLog>,
+    eventlog: Option<Mutex<EventLog>>,
     tee: Tee,
 }
 
@@ -90,16 +90,15 @@ impl AttestationAgent {
             let pcr = self.config.eventlog_config.init_pcr;
             let init_entry = LogEntry::Init(alg);
             let digest = init_entry.digest_with(alg);
-            {
-                // perform atomicly in this block
-                let mut eventlog = self.eventlog.lock().await;
-                self.attester
-                    .extend_runtime_measurement(digest, pcr)
-                    .await
-                    .context("write INIT entry")?;
+            let mut eventlog = EventLog::new()?;
+            eventlog.write_log(&init_entry).context("write INIT log")?;
+
+            self.attester
+                .extend_runtime_measurement(digest, pcr)
+                .await
+                .context("write INIT entry")?;
 
-                eventlog.write_log(&init_entry).context("write INIT log")?;
-            };
+            self.eventlog = Some(Mutex::new(eventlog));
         }
 
         Ok(())
@@ -120,12 +119,11 @@ impl AttestationAgent {
 
         let tee = detect_tee_type();
         let attester: BoxedAttester = tee.try_into()?;
-        let eventlog = Mutex::new(EventLog::new()?);
 
         Ok(AttestationAgent {
             config,
             attester,
-            eventlog,
+            eventlog: None,
             tee,
         })
     }
@@ -192,9 +190,9 @@ impl AttestationAPIs for AttestationAgent {
         content: &str,
         register_index: Option<u64>,
     ) -> Result<()> {
-        if !self.config.eventlog_config.enable_eventlog {
+        let Some(ref eventlog) = self.eventlog else {
             bail!("Extend eventlog not enabled when launching!");
-        }
+        };
 
         let pcr = register_index.unwrap_or_else(|| {
             let pcr = self.config.eventlog_config.init_pcr;
@@ -213,7 +211,7 @@ impl AttestationAPIs for AttestationAgent {
         let digest = log_entry.digest_with(alg);
         {
             // perform atomicly in this block
-            let mut eventlog = self.eventlog.lock().await;
+            let mut eventlog = eventlog.lock().await;
             self.attester
                 .extend_runtime_measurement(digest, pcr)
                 .await?;