Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

binpac: BIT-1829: throw exceptions for excessive array sizes

Browse source 
For arrays with unknown element size, it used to cap the array length to
be the maximum it could be for the given input buffer, assuming 1-byte
elements.  An exception is instead now raised for cases where the
maximum array size (number of elements) exceeds what's possibly in the
buffer.  Using an exception versus capping the length may help prevent
protocol analyzers from unintentionally accessing array indices that
were not actually parsed even if the evauluated-length-expression for
that given array implies it may have been.
This commit is contained in:
Jon Siwek 2018-05-22 12:33:23 -05:00 • committed by Tim Wojtulewicz
parent 5a688c2730
commit 455e2fbac5
1 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tools/binpac/src/pac_array.cc
View file

@ -278,23 +278,6 @@ void ArrayType::GenArrayLength(Output *out_cc, Env *env, const DataPtr& data)
env->SetEvaluated(arraylength_var()); env->SetEvaluated(arraylength_var());
// Check for overlong array length. We cap it at the
// maximum data size as we won't store more elements.
// e.g. this helps prevent user-controlled length fields
// from causing an excessive memory-allocation (for
// the array we'll be parsing into) unless they actually
// sent enough data to go along with it. Note that this check
// is *not* looking for whether the contents of the array will
// extend past the end of the data buffer.
out_cc->println("if ( t_begin_of_data + %s > t_end_of_data + 1 || t_begin_of_data + %s < t_begin_of_data )",
env->LValue(arraylength_var()), env->LValue(arraylength_var()));
out_cc->inc_indent();
out_cc->println("{");
out_cc->println("%s = t_end_of_data - t_begin_of_data + 1;",
env->LValue(arraylength_var()));
out_cc->println("}");
out_cc->dec_indent();
// Check negative array length // Check negative array length
out_cc->println("if ( %s < 0 )", out_cc->println("if ( %s < 0 )",
env->LValue(arraylength_var())); env->LValue(arraylength_var()));
@ -305,14 +288,34 @@ void ArrayType::GenArrayLength(Output *out_cc, Env *env, const DataPtr& data)
out_cc->println("}"); out_cc->println("}");
out_cc->dec_indent(); out_cc->dec_indent();
if ( elemtype_->StaticSize(env) != -1 ) string array_size;
if ( elemtype_->StaticSize(env) == -1 )
{
// Check for overlong array quantity. We cap it at the maximum
// array size (assume 1-byte elements * array length) as we can't
// possibly store more elements. e.g. this helps prevent
// user-controlled length fields from causing an excessive
// iteration and/or memory-allocation (for the array we'll be
// parsing into) unless they actually sent enough data to go along
// with it. Note that this check is *not* looking for whether the
// contents of the array will extend past the end of the data
// buffer.
out_cc->println("// Check array element quantity: %s",
data_id_str_.c_str());
array_size = strfmt("(%s)", env->RValue(arraylength_var()));
}
else
{ {
// Boundary check the entire array if elements have static size. // Boundary check the entire array if elements have static size.
string array_size = strfmt("((%d) * (%s))",
elemtype_->StaticSize(env),
env->RValue(arraylength_var()));
out_cc->println("// Check bounds for static-size array: %s", out_cc->println("// Check bounds for static-size array: %s",
data_id_str_.c_str()); data_id_str_.c_str());
elemtype_->SetBoundaryChecked();
array_size = strfmt("((%d) * (%s))",
elemtype_->StaticSize(env),
env->RValue(arraylength_var()));
}
out_cc->println("if ( t_begin_of_data + %s > t_end_of_data || " out_cc->println("if ( t_begin_of_data + %s > t_end_of_data || "
"t_begin_of_data + %s < t_begin_of_data )", "t_begin_of_data + %s < t_begin_of_data )",
array_size.c_str(), array_size.c_str()); array_size.c_str(), array_size.c_str());
@ -324,8 +327,6 @@ void ArrayType::GenArrayLength(Output *out_cc, Env *env, const DataPtr& data)
env->RValue(end_of_data), env->RValue(end_of_data),
env->RValue(begin_of_data)); env->RValue(begin_of_data));
out_cc->dec_indent(); out_cc->dec_indent();
elemtype_->SetBoundaryChecked();
}
} }
else if ( attr_restofdata_ ) else if ( attr_restofdata_ )
{ {