Decode mountpoint while reading /proc/self/mountinfo

Author: t0hsumi

benchexec/container.py

@@ -802,15 +802,17 @@ def setup_fuse_overlay_upperdir(upperdir):
             if len(fields) < 5:
                 continue
             device_id, mountpoint = fields[2], fields[4]
-            device_id_to_mounts.setdefault(device_id, []).append(mountpoint)
+            device_id_to_mounts.setdefault(device_id, []).append(
+                _decode_path(mountpoint)
+            )
 
     for device_id, mounts in device_id_to_mounts.items():
         # Skip single mounts
         if len(mounts) <= 1:
             continue
         # Make `upperdir/target` directory
         for target in mounts:
-            if not os.path.isdir(_decode_path(target)):
+            if not os.path.isdir(target):
                 continue
             target_in_upperdir = upperdir + target
             os.makedirs(target_in_upperdir, exist_ok=True)