d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dtc: Sync with upstream version e9a77451cdd8

Browse Source 
1c231509cf88 ("Validate integers fit in cells") is the only change
missing from our copy.

Reviewed by:	manu, imp
Differential Revision:	https://reviews.freebsd.org/D34368
This commit is contained in:
Jessica Clarke 2022-02-28 22:37:47 +00:00
parent 1a9b1c367f
commit 89f5bc467c
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/dtc/fdt.cc
View File

@ -335,10 +335,28 @@ property::parse_cells(text_input_buffer &input, int cell_size)
unsigned long long val; unsigned long long val;
if (!input.consume_integer_expression(val)) if (!input.consume_integer_expression(val))
{ {
// FIXME: Distinguish invalid syntax from a
// number that cannot be represented in an
// unsigned long long.
input.parse_error("Expected numbers in array of cells"); input.parse_error("Expected numbers in array of cells");
valid = false; valid = false;
return; return;
} }
// FIXME: No sign information available, so cannot
// distinguish small negative values from large
// positive ones, and thus we have to conservatively
// permit anything that looks like a sign-extended
// negative integer.
if (cell_size < 64 && val >= (1ull << cell_size) &&
(val | ((1ull << (cell_size - 1)) - 1)) !=
std::numeric_limits<unsigned long long>::max())
{
std::string msg = "Value does not fit in a " +
std::to_string(cell_size) + "-bit cell";
input.parse_error(msg.c_str());
valid = false;
return;
}
switch (cell_size) switch (cell_size)
{ {
case 8: case 8:

5
usr.bin/dtc/input_buffer.cc
View File

@ -349,8 +349,11 @@ input_buffer::consume_integer(unsigned long long &outInt)
return false; return false;
} }
char *end= const_cast<char*>(&buffer[size]); char *end= const_cast<char*>(&buffer[size]);
errno = 0;
outInt = strtoull(&buffer[cursor], &end, 0); outInt = strtoull(&buffer[cursor], &end, 0);
if (end == &buffer[cursor]) if (end == &buffer[cursor] ||
(outInt == std::numeric_limits<unsigned long long>::max() &&
errno == ERANGE))
{ {
return false; return false;
} }