From 6ba294a11e48e8cf2d51ab9d7eb5595aa5e6a46e Mon Sep 17 00:00:00 2001
From: Tim Zhang <tim@hyper.sh>
Date: Wed, 14 Oct 2020 10:18:00 +0800
Subject: [PATCH] agent: remove `unwrap()` for `e.as_errno()`

Use `{:?}` to print `e.as_errno()` instead of using `{}`
to print `e.as_errno().unwrap().desc()`.

Avoid panic only caused by error's content.

Signed-off-by: Tim Zhang <tim@hyper.sh>
---
 src/agent/rustjail/src/container.rs |  4 ++--
 src/agent/rustjail/src/mount.rs     | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/agent/rustjail/src/container.rs b/src/agent/rustjail/src/container.rs
index 9add8d152e..7c166fd24c 100644
--- a/src/agent/rustjail/src/container.rs
+++ b/src/agent/rustjail/src/container.rs
@@ -397,7 +397,7 @@ fn do_init_child(cwfd: RawFd) -> Result<()> {
                         ns.r#type.clone(),
                         ns.path.clone()
                     );
-                    log_child!(cfd_log, "error is : {}", e.as_errno().unwrap().desc());
+                    log_child!(cfd_log, "error is : {:?}", e.as_errno());
                     e
                 })?;
 
@@ -1080,7 +1080,7 @@ fn get_pid_namespace(logger: &Logger, linux: &Linux) -> Result<Option<RawFd>> {
                         ns.r#type.clone(),
                         ns.path.clone()
                     );
-                    error!(logger, "error is : {}", e.as_errno().unwrap().desc());
+                    error!(logger, "error is : {:?}", e.as_errno());
 
                     e
                 })?;
diff --git a/src/agent/rustjail/src/mount.rs b/src/agent/rustjail/src/mount.rs
index cc3b928a4a..1942fcc5b8 100644
--- a/src/agent/rustjail/src/mount.rs
+++ b/src/agent/rustjail/src/mount.rs
@@ -712,9 +712,9 @@ fn mount_from(
     let _ = stat::stat(dest.as_str()).map_err(|e| {
         log_child!(
             cfd_log,
-            "dest stat error. {}: {}",
+            "dest stat error. {}: {:?}",
             dest.as_str(),
-            e.as_errno().unwrap().desc()
+            e.as_errno()
         )
     });
 
@@ -726,7 +726,7 @@ fn mount_from(
         Some(d.as_str()),
     )
     .map_err(|e| {
-        log_child!(cfd_log, "mount error: {}", e.as_errno().unwrap().desc());
+        log_child!(cfd_log, "mount error: {:?}", e.as_errno());
         e
     })?;
 
@@ -748,12 +748,7 @@ fn mount_from(
             None::<&str>,
         )
         .map_err(|e| {
-            log_child!(
-                cfd_log,
-                "remout {}: {}",
-                dest.as_str(),
-                e.as_errno().unwrap().desc()
-            );
+            log_child!(cfd_log, "remout {}: {:?}", dest.as_str(), e.as_errno());
             e
         })?;
     }