Changeset da680b4b in mainline for uspace/srv/volsrv/part.c

Timestamp:

2018-07-06T17:18:28Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6419c6e

Parents:

9ba040a

Message:

Don't automatically mount writable filesystems on ATA hard drives. Better be safe than sorry. (But no way to override yet.)

File:

• uspace/srv/volsrv/part.c (modified) (2 diffs)

uspace/srv/volsrv/part.c

@@ -256 +256 @@
 }
 
+/** Determine if partition is allowed to be mounted by default.
+ *
+ * @param part Partition
+ * @return @c true iff partition is allowed to be mounted by default
+ */
+static bool vol_part_allow_mount_by_def(vol_part_t *part)
+{
+        /* CDFS is safe to mount (after all, it is read-only) */
+        if (part->pcnt == vpc_fs && part->fstype == fs_cdfs)
+                return true;
+
+        /* For other file systems disallow mounting from ATA hard drive */
+        if (str_str(part->svc_name, "\\ata-c") != NULL)
+                return false;
+
+        /* Allow otherwise (e.g. USB mass storage) */
+        return true;
+}
+
 static errno_t vol_part_mount(vol_part_t *part)
 {
@@ -265 +284 @@
                 /* Don't mount nameless volumes */
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless partition.");
+                return EOK;
+        }
+
+        if (!vol_part_allow_mount_by_def(part)) {
+                /* Don't mount partition by default */
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting per default policy.");
                 return EOK;
         }