LV name validation

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index f400971fe8617caf0926d4025f380139899ce5b7..4956b9b961884dec20eebecc7191db271ec6704e 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -781,7 +781,7 @@ int vgname_from_mda(const struct format_type *fmt, struct device_area *dev_area,
                buf[len] = '\0';
 
                /* Ignore this entry if the characters aren't permissible */
-               if (!validate_vgname(buf)) {
+               if (!validate_name(buf)) {
                        stack;
                        goto out;
                }

diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 9a574765749ffd0c606ea20df16b8cc95184ffab..5973d989c1e545dd3430cae1f728a27196c860be 100644 (file)
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -436,7 +436,7 @@ int vg_add_snapshot(struct logical_volume *origin,
 
 int vg_remove_snapshot(struct volume_group *vg, struct logical_volume *cow);
 
-static inline int validate_vgname(const char *n)
+static inline int validate_name(const char *n)
 {
        register char c;
        register int len = 0;

diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 450477d3066fa6f476f7c068bea3c5a56b50c6e0..74d21caad9b266e6e28903260b0d28297ac56f8f 100644 (file)
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -116,6 +116,12 @@ static int _read_name_params(struct lvcreate_params *lp,
                return 0;
        }
 
+       if (!validate_name(lp->lv_name)) {
+               log_error("Logical volume name \"%s\" has invalid characters",
+                         lp->lv_name);
+               return 0;
+       }
+
        return 1;
 }
 

diff --git a/tools/lvrename.c b/tools/lvrename.c
index f9c64571461882aadaa93204c9d8f1cf98fce0e8..b2671b74404e1d0a70c4a13822fd4ad40b578b91 100644 (file)
--- a/tools/lvrename.c
+++ b/tools/lvrename.c
@@ -55,7 +55,7 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
                return EINVALID_CMD_LINE;
        }
 
-       if (!validate_vgname(vg_name)) {
+       if (!validate_name(vg_name)) {
                log_error("Please provide a valid volume group name");
                return EINVALID_CMD_LINE;
        }
@@ -95,7 +95,7 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
                return ECMD_FAILED;
        }
 
-       if (!validate_vgname(lv_name_new)) {
+       if (!validate_name(lv_name_new)) {
                log_error
                    ("New logical volume name \"%s\" has invalid characters",
                     lv_name_new);

diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c
index 380760afa79a6549018e145937751fb72fb33130..f48dc12258168e93d41595f78ca89ee0a30279ed 100644 (file)
--- a/tools/vgcfgrestore.c
+++ b/tools/vgcfgrestore.c
@@ -20,7 +20,7 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv)
        if (!strncmp(vg_name, cmd->dev_dir, strlen(cmd->dev_dir)))
                vg_name += strlen(cmd->dev_dir);
 
-       if (!validate_vgname(vg_name)) {
+       if (!validate_name(vg_name)) {
                log_error("Volume group name \"%s\" has invalid characters",
                          vg_name);
                return ECMD_FAILED;

diff --git a/tools/vgcreate.c b/tools/vgcreate.c
index 0ba620f4c5febe98c9766c1195561061fdfc8ea7..52a29c0c7280cb10f9770a93f030f7afc475fc2f 100644 (file)
--- a/tools/vgcreate.c
+++ b/tools/vgcreate.c
@@ -73,7 +73,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
                return ECMD_FAILED;
        }
 
-       if (!validate_vgname(vg_name)) {
+       if (!validate_name(vg_name)) {
                log_error("New volume group name \"%s\" has invalid characters",
                          vg_name);
                return ECMD_FAILED;

diff --git a/tools/vgrename.c b/tools/vgrename.c
index c9f84724086ee2c2e439ec337937fbc8704c63b3..c3015e8ce3482e09e73c649fceb65ffa8f701630 100644 (file)
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -56,7 +56,7 @@ int vgrename(struct cmd_context *cmd, int argc, char **argv)
                return ECMD_FAILED;
        }
 
-       if (!validate_vgname(vg_name_new)) {
+       if (!validate_name(vg_name_new)) {
                log_error("New volume group name \"%s\" has invalid characters",
                          vg_name_new);
                return ECMD_FAILED;