aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2022-12-16 15:25:35 +0000
committerMark Johnston <markj@FreeBSD.org>2022-12-16 15:30:58 +0000
commita9e7a44c243671647180160fc448a3ef3950f55c (patch)
treef55ae981f3900b14b440d963698a9cd55cf95894
parent38d2b4db7853ecfb87b40e83a9b9de9985c2fdc1 (diff)
downloadsrc-a9e7a44c243671647180160fc448a3ef3950f55c.tar.gz
src-a9e7a44c243671647180160fc448a3ef3950f55c.zip
makefs: Add some validation of ZFS pool names
Reported by: imp
-rw-r--r--usr.sbin/makefs/zfs.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c
index b92d08734d59..e86f838e8b5c 100644
--- a/usr.sbin/makefs/zfs.c
+++ b/usr.sbin/makefs/zfs.c
@@ -33,6 +33,7 @@
#include <sys/queue.h>
#include <assert.h>
+#include <ctype.h>
#include <fcntl.h>
#include <stdalign.h>
#include <stdbool.h>
@@ -215,6 +216,19 @@ zfs_check_opts(fsinfo_t *fsopts)
if (zfs->poolname == NULL)
errx(1, "a pool name must be specified");
+ if (!isalpha(zfs->poolname[0]))
+ errx(1, "the pool name must begin with a letter");
+ for (size_t i = 0, len = strlen(zfs->poolname); i < len; i++) {
+ if (!isalnum(zfs->poolname[i]) && zfs->poolname[i] != '_')
+ errx(1, "invalid character '%c' in pool name",
+ zfs->poolname[i]);
+ }
+ if (strcmp(zfs->poolname, "mirror") == 0 ||
+ strcmp(zfs->poolname, "raidz") == 0 ||
+ strcmp(zfs->poolname, "draid") == 0) {
+ errx(1, "pool name '%s' is reserved and cannot be used",
+ zfs->poolname);
+ }
if (zfs->rootpath == NULL)
easprintf(&zfs->rootpath, "/%s", zfs->poolname);