All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit a47aa7fe authored by Mike Hibler's avatar Mike Hibler

Taint check some args.

parent 780d4c63
......@@ -163,7 +163,9 @@ if (defined($options{P})) {
}
}
if (defined($options{s})) {
$size = $options{s};
if ($options{s} =~ /^(\d+)$/) {
$size = $1;
}
}
if (defined($options{t})) {
$type = $options{t};
......@@ -591,8 +593,10 @@ sub bs_create($$$@)
if (!defined($size)) {
fatal("create: must specify a size in MiB (-s)");
}
if (!defined($name) || $name !~ /^[-\w]+$/) {
fatal("create: must specify a valid name");
if (defined($name) && $name =~ /^([-\w]+)$/) {
$name = $1;
} else {
fatal("create: must specify a valid volume name");
}
if ($leaseidx !~ /^\d+$/) {
......@@ -710,8 +714,10 @@ sub bs_destroy($$$@)
{
my ($srv,$pool,$size,$name) = @_;
if (!defined($name) || $name !~ /^[-\w]+$/) {
fatal("destroy: must specify a valid name");
if (defined($name) && $name =~ /^([-\w]+)$/) {
$name = $1;
} else {
fatal("create: must specify a valid volume name");
}
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment