shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-03 17:47:44 +03:00
Code Releases Activity

LV name validation

Browse Source
This commit is contained in:
Alasdair Kergon 2003-02-03 20:09:58 +00:00
parent e2884dcdb7
commit de7897a864
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/format_text/format-text.c
View File

@ -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;
}

2
lib/metadata/metadata.h
View File

@ -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;

6
tools/lvcreate.c
View File

@ -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;
}

4
tools/lvrename.c
View File

@ -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);

2
tools/vgcfgrestore.c
View File

@ -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;

2
tools/vgcreate.c
View File

@ -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;

2
tools/vgrename.c
View File

@ -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;